<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[34778] trunk/src: MS: Use `*_network_option()` functions throughout core.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/34778">34778</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/34778","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>jeremyfelt</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-10-02 19:07:23 +0000 (Fri, 02 Oct 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>MS: Use `*_network_option()` functions throughout core.
Replaces all uses of `*_site_option()` with the corresponding "network" function.
This excludes one usage in `wp-admin/admin-footer.php` that needs more investigation.
Props spacedmonkey.
See <a href="https://core.trac.wordpress.org/ticket/28290">#28290</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesajaxactionsphp">trunk/src/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswppluginslisttablephp">trunk/src/wp-admin/includes/class-wp-plugins-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpthemeslisttablephp">trunk/src/wp-admin/includes/class-wp-themes-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpupgraderphp">trunk/src/wp-admin/includes/class-wp-upgrader.php</a></li>
<li><a href="#trunksrcwpadminincludesdashboardphp">trunk/src/wp-admin/includes/dashboard.php</a></li>
<li><a href="#trunksrcwpadminincludesmsphp">trunk/src/wp-admin/includes/ms.php</a></li>
<li><a href="#trunksrcwpadminincludesnetworkphp">trunk/src/wp-admin/includes/network.php</a></li>
<li><a href="#trunksrcwpadminincludespluginphp">trunk/src/wp-admin/includes/plugin.php</a></li>
<li><a href="#trunksrcwpadminincludesschemaphp">trunk/src/wp-admin/includes/schema.php</a></li>
<li><a href="#trunksrcwpadminincludesupdatecorephp">trunk/src/wp-admin/includes/update-core.php</a></li>
<li><a href="#trunksrcwpadminincludesupdatephp">trunk/src/wp-admin/includes/update.php</a></li>
<li><a href="#trunksrcwpadminincludesupgradephp">trunk/src/wp-admin/includes/upgrade.php</a></li>
<li><a href="#trunksrcwpadminnetworksettingsphp">trunk/src/wp-admin/network/settings.php</a></li>
<li><a href="#trunksrcwpadminnetworksitenewphp">trunk/src/wp-admin/network/site-new.php</a></li>
<li><a href="#trunksrcwpadminnetworkthemesphp">trunk/src/wp-admin/network/themes.php</a></li>
<li><a href="#trunksrcwpadminnetworkupgradephp">trunk/src/wp-admin/network/upgrade.php</a></li>
<li><a href="#trunksrcwpadminoptionswritingphp">trunk/src/wp-admin/options-writing.php</a></li>
<li><a href="#trunksrcwpadminoptionsphp">trunk/src/wp-admin/options.php</a></li>
<li><a href="#trunksrcwpadminplugineditorphp">trunk/src/wp-admin/plugin-editor.php</a></li>
<li><a href="#trunksrcwpadminpluginsphp">trunk/src/wp-admin/plugins.php</a></li>
<li><a href="#trunksrcwpadminusereditphp">trunk/src/wp-admin/user-edit.php</a></li>
<li><a href="#trunksrcwpincludescapabilitiesfunctionsphp">trunk/src/wp-includes/capabilities-functions.php</a></li>
<li><a href="#trunksrcwpincludesclasswpthemephp">trunk/src/wp-includes/class-wp-theme.php</a></li>
<li><a href="#trunksrcwpincludesdefaultconstantsphp">trunk/src/wp-includes/default-constants.php</a></li>
<li><a href="#trunksrcwpincludesfunctionsphp">trunk/src/wp-includes/functions.php</a></li>
<li><a href="#trunksrcwpincludesl10nphp">trunk/src/wp-includes/l10n.php</a></li>
<li><a href="#trunksrcwpincludesmsdefaultconstantsphp">trunk/src/wp-includes/ms-default-constants.php</a></li>
<li><a href="#trunksrcwpincludesmsdeprecatedphp">trunk/src/wp-includes/ms-deprecated.php</a></li>
<li><a href="#trunksrcwpincludesmsfunctionsphp">trunk/src/wp-includes/ms-functions.php</a></li>
<li><a href="#trunksrcwpincludesmsloadphp">trunk/src/wp-includes/ms-load.php</a></li>
<li><a href="#trunksrcwpincludesmssettingsphp">trunk/src/wp-includes/ms-settings.php</a></li>
<li><a href="#trunksrcwpincludesoptionphp">trunk/src/wp-includes/option.php</a></li>
<li><a href="#trunksrcwpincludespluggablephp">trunk/src/wp-includes/pluggable.php</a></li>
<li><a href="#trunksrcwpincludesscriptloaderphp">trunk/src/wp-includes/script-loader.php</a></li>
<li><a href="#trunksrcwpincludesuserfunctionsphp">trunk/src/wp-includes/user-functions.php</a></li>
<li><a href="#trunksrcwpsignupphp">trunk/src/wp-signup.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesajaxactionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/ajax-actions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/ajax-actions.php 2015-10-02 18:00:30 UTC (rev 34777)
+++ trunk/src/wp-admin/includes/ajax-actions.php 2015-10-02 19:07:23 UTC (rev 34778)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -165,7 +165,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( -1 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ini_get('zlib.output_compression') || 'ob_gzhandler' == ini_get('output_handler') ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_site_option('can_compress_scripts', 0);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_network_option( 'can_compress_scripts', 0 );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die( 0 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -196,9 +196,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo $out;
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die();
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'no' == $_GET['test'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_site_option('can_compress_scripts', 0);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_network_option( 'can_compress_scripts', 0 );
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'yes' == $_GET['test'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_site_option('can_compress_scripts', 1);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_network_option( 'can_compress_scripts', 1 );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswppluginslisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-plugins-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-plugins-list-table.php 2015-10-02 18:00:30 UTC (rev 34777)
+++ trunk/src/wp-admin/includes/class-wp-plugins-list-table.php 2015-10-02 19:07:23 UTC (rev 34778)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -130,7 +130,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> set_transient( 'plugin_slugs', array_keys( $plugins['all'] ), DAY_IN_SECONDS );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $screen->in_admin( 'network' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $recently_activated = get_site_option( 'recently_activated', array() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $recently_activated = get_network_option( 'recently_activated', array() );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $recently_activated = get_option( 'recently_activated', array() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -142,7 +142,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $screen->in_admin( 'network' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_site_option( 'recently_activated', $recently_activated );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_network_option( 'recently_activated', $recently_activated );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'recently_activated', $recently_activated );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpthemeslisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-themes-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-themes-list-table.php 2015-10-02 18:00:30 UTC (rev 34777)
+++ trunk/src/wp-admin/includes/class-wp-themes-list-table.php 2015-10-02 19:07:23 UTC (rev 34778)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -102,7 +102,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> // Fallthrough.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf( __( 'Only the current theme is available to you. Contact the %s administrator for information about accessing additional themes.' ), get_site_option( 'site_name' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf( __( 'Only the current theme is available to you. Contact the %s administrator for information about accessing additional themes.' ), get_network_option( 'site_name' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpupgraderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-upgrader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-upgrader.php 2015-10-02 18:00:30 UTC (rev 34777)
+++ trunk/src/wp-admin/includes/class-wp-upgrader.php 2015-10-02 19:07:23 UTC (rev 34778)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2368,7 +2368,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( version_compare( $wp_version, $offered_ver, '>' ) )
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $failure_data = get_site_option( 'auto_core_update_failed' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $failure_data = get_network_option( 'auto_core_update_failed' );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $failure_data ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // If this was a critical update failure, cannot update.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $failure_data['critical'] ) )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2780,10 +2780,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param object $item The update offer.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function send_core_update_notification_email( $item ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $notified = get_site_option( 'auto_core_update_notified' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $notified = get_network_option( 'auto_core_update_notified' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Don't notify if we've already notified the same email address of the same version.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $notified && $notified['email'] == get_site_option( 'admin_email' ) && $notified['version'] == $item->current )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $notified && $notified['email'] == get_network_option( 'admin_email' ) && $notified['version'] == $item->current )
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // See if we need to notify users of a core update.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3108,7 +3108,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $critical_data['rollback_code'] = $rollback_result->get_error_code();
</span><span class="cx" style="display: block; padding: 0 10px"> $critical_data['rollback_data'] = $rollback_result->get_error_data();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_site_option( 'auto_core_update_failed', $critical_data );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_network_option( 'auto_core_update_failed', $critical_data );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->send_email( 'critical', $core_update, $result );
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3126,17 +3126,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $send = true;
</span><span class="cx" style="display: block; padding: 0 10px"> $transient_failures = array( 'incompatible_archive', 'download_failed', 'insane_distro' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $error_code, $transient_failures ) && ! get_site_option( 'auto_core_update_failed' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $error_code, $transient_failures ) && ! get_network_option( 'auto_core_update_failed' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_schedule_single_event( time() + HOUR_IN_SECONDS, 'wp_maybe_auto_update' );
</span><span class="cx" style="display: block; padding: 0 10px"> $send = false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $n = get_site_option( 'auto_core_update_notified' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $n = get_network_option( 'auto_core_update_notified' );
</ins><span class="cx" style="display: block; padding: 0 10px"> // Don't notify if we've already notified the same email address of the same version of the same notification type.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $n && 'fail' == $n['type'] && $n['email'] == get_site_option( 'admin_email' ) && $n['version'] == $core_update->current )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $n && 'fail' == $n['type'] && $n['email'] == get_network_option( 'admin_email' ) && $n['version'] == $core_update->current )
</ins><span class="cx" style="display: block; padding: 0 10px"> $send = false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_site_option( 'auto_core_update_failed', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_network_option( 'auto_core_update_failed', array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'attempted' => $core_update->current,
</span><span class="cx" style="display: block; padding: 0 10px"> 'current' => $wp_version,
</span><span class="cx" style="display: block; padding: 0 10px"> 'error_code' => $error_code,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3162,9 +3162,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param mixed $result Optional. The result for the core update. Can be WP_Error.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function send_email( $type, $core_update, $result = null ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_site_option( 'auto_core_update_notified', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_network_option( 'auto_core_update_notified', array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => $type,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'email' => get_site_option( 'admin_email' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'email' => get_network_option( 'admin_email' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'version' => $core_update->current,
</span><span class="cx" style="display: block; padding: 0 10px"> 'timestamp' => time(),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3320,7 +3320,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $body .= "\n";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $to = get_site_option( 'admin_email' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $to = get_network_option( 'admin_email' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $headers = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $email = compact( 'to', 'subject', 'body', 'headers' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3494,7 +3494,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $email = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'to' => get_site_option( 'admin_email' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'to' => get_network_option( 'admin_email' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'subject' => $subject,
</span><span class="cx" style="display: block; padding: 0 10px"> 'body' => implode( "\n", $body ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'headers' => ''
</span></span></pre></div>
<a id="trunksrcwpadminincludesdashboardphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/dashboard.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/dashboard.php 2015-10-02 18:00:30 UTC (rev 34777)
+++ trunk/src/wp-admin/includes/dashboard.php 2015-10-02 19:07:23 UTC (rev 34778)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1196,7 +1196,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool|null True if not multisite, user can't upload files, or the space check option is disabled.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_dashboard_quota() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !is_multisite() || !current_user_can( 'upload_files' ) || get_site_option( 'upload_space_check_disabled' ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( !is_multisite() || !current_user_can( 'upload_files' ) || get_network_option( 'upload_space_check_disabled' ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $quota = get_space_allowed();
</span></span></pre></div>
<a id="trunksrcwpadminincludesmsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/ms.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/ms.php 2015-10-02 18:00:30 UTC (rev 34777)
+++ trunk/src/wp-admin/includes/ms.php 2015-10-02 19:07:23 UTC (rev 34778)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,7 +16,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array $_FILES array with 'error' key set if file exceeds quota. 'error' is empty otherwise.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function check_upload_size( $file ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( get_site_option( 'upload_space_check_disabled' ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( get_network_option( 'upload_space_check_disabled' ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> return $file;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $file['error'] != '0' ) // there's already an error
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,8 +30,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $file_size = filesize( $file['tmp_name'] );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $space_left < $file_size )
</span><span class="cx" style="display: block; padding: 0 10px"> $file['error'] = sprintf( __( 'Not enough space to upload. %1$s KB needed.' ), number_format( ($file_size - $space_left) /1024 ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $file_size > ( 1024 * get_site_option( 'fileupload_maxk', 1500 ) ) )
- $file['error'] = sprintf(__('This file is too big. Files must be less than %1$s KB in size.'), get_site_option( 'fileupload_maxk', 1500 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $file_size > ( 1024 * get_network_option( 'fileupload_maxk', 1500 ) ) )
+ $file['error'] = sprintf(__('This file is too big. Files must be less than %1$s KB in size.'), get_network_option( 'fileupload_maxk', 1500 ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( upload_is_user_over_quota( false ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $file['error'] = __( 'You have used your space quota. Please delete files before uploading.' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -98,7 +98,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $upload_path = trim( get_option( 'upload_path' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If ms_files_rewriting is enabled and upload_path is empty, wp_upload_dir is not reliable.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $drop && get_site_option( 'ms_files_rewriting' ) && empty( $upload_path ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $drop && get_network_option( 'ms_files_rewriting' ) && empty( $upload_path ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $drop = false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -306,7 +306,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $content = str_replace( '###USERNAME###', $current_user->user_login, $content );
</span><span class="cx" style="display: block; padding: 0 10px"> $content = str_replace( '###ADMIN_URL###', esc_url( admin_url( 'options.php?adminhash='.$hash ) ), $content );
</span><span class="cx" style="display: block; padding: 0 10px"> $content = str_replace( '###EMAIL###', $value, $content );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $content = str_replace( '###SITENAME###', get_site_option( 'site_name' ), $content );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $content = str_replace( '###SITENAME###', get_network_option( 'site_name' ), $content );
</ins><span class="cx" style="display: block; padding: 0 10px"> $content = str_replace( '###SITEURL###', network_home_url(), $content );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_mail( $value, sprintf( __( '[%s] New Admin Email Address' ), wp_specialchars_decode( get_option( 'blogname' ) ) ), $content );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -385,7 +385,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $content = str_replace( '###USERNAME###', $current_user->user_login, $content );
</span><span class="cx" style="display: block; padding: 0 10px"> $content = str_replace( '###ADMIN_URL###', esc_url( admin_url( 'profile.php?newuseremail='.$hash ) ), $content );
</span><span class="cx" style="display: block; padding: 0 10px"> $content = str_replace( '###EMAIL###', $_POST['email'], $content);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $content = str_replace( '###SITENAME###', get_site_option( 'site_name' ), $content );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $content = str_replace( '###SITENAME###', get_network_option( 'site_name' ), $content );
</ins><span class="cx" style="display: block; padding: 0 10px"> $content = str_replace( '###SITEURL###', network_home_url(), $content );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_mail( $_POST['email'], sprintf( __( '[%s] New Email Address' ), wp_specialchars_decode( get_option( 'blogname' ) ) ), $content );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -413,7 +413,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool True if user is over upload space quota, otherwise false.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function upload_is_user_over_quota( $echo = true ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( get_site_option( 'upload_space_check_disabled' ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( get_network_option( 'upload_space_check_disabled' ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $space_allowed = get_space_allowed();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -746,7 +746,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_db_version;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !is_super_admin() )
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( get_site_option( 'wpmu_upgrade_site' ) != $wp_db_version )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( get_network_option( 'wpmu_upgrade_site' ) != $wp_db_version )
</ins><span class="cx" style="display: block; padding: 0 10px"> echo "<div class='update-nag'>" . sprintf( __( 'Thank you for Updating! Please visit the <a href="%s">Upgrade Network</a> page to update all your sites.' ), esc_url( network_admin_url( 'upgrade.php' ) ) ) . "</div>";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -828,7 +828,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( in_array( get_site_option( 'registration' ), array( 'all', 'blog' ) ) ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( in_array( get_network_option( 'registration' ), array( 'all', 'blog' ) ) ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row" colspan="2" class="th-full">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -870,12 +870,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'grant_super_admin', $user_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Directly fetch site_admins instead of using get_super_admins()
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $super_admins = get_site_option( 'site_admins', array( 'admin' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $super_admins = get_network_option( 'site_admins', array( 'admin' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $user = get_userdata( $user_id );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $user && ! in_array( $user->user_login, $super_admins ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $super_admins[] = $user->user_login;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_site_option( 'site_admins' , $super_admins );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_network_option( 'site_admins' , $super_admins );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires after the user is granted Super Admin privileges.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -917,13 +917,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'revoke_super_admin', $user_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Directly fetch site_admins instead of using get_super_admins()
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $super_admins = get_site_option( 'site_admins', array( 'admin' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $super_admins = get_network_option( 'site_admins', array( 'admin' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $user = get_userdata( $user_id );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $user && 0 !== strcasecmp( $user->user_email, get_site_option( 'admin_email' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $user && 0 !== strcasecmp( $user->user_email, get_network_option( 'admin_email' ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( false !== ( $key = array_search( $user->user_login, $super_admins ) ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $super_admins[$key] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_site_option( 'site_admins', $super_admins );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_network_option( 'site_admins', $super_admins );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires after the user's Super Admin privileges are revoked.
</span></span></pre></div>
<a id="trunksrcwpadminincludesnetworkphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/network.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/network.php 2015-10-02 18:00:30 UTC (rev 34777)
+++ trunk/src/wp-admin/includes/network.php 2015-10-02 19:07:23 UTC (rev 34778)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -450,7 +450,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <match url="^index\.php$" ignoreCase="false" />
</span><span class="cx" style="display: block; padding: 0 10px"> <action type="None" />
</span><span class="cx" style="display: block; padding: 0 10px"> </rule>';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_multisite() && get_site_option( 'ms_files_rewriting' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_multisite() && get_network_option( 'ms_files_rewriting' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $web_config_file .= '
</span><span class="cx" style="display: block; padding: 0 10px"> <rule name="WordPress Rule for Files" stopProcessing="true">
</span><span class="cx" style="display: block; padding: 0 10px"> <match url="^' . $iis_subdir_match . 'files/(.+)" ignoreCase="false" />
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -506,7 +506,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : // end iis7_supports_permalinks(). construct an htaccess file instead:
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $ms_files_rewriting = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_multisite() && get_site_option( 'ms_files_rewriting' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_multisite() && get_network_option( 'ms_files_rewriting' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $ms_files_rewriting = "\n# uploaded files\nRewriteRule ^";
</span><span class="cx" style="display: block; padding: 0 10px"> $ms_files_rewriting .= $subdir_match . "files/(.+) {$rewrite_base}" . WPINC . "/ms-files.php?file={$subdir_replacement_12} [L]" . "\n";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludespluginphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/plugin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/plugin.php 2015-10-02 18:00:30 UTC (rev 34777)
+++ trunk/src/wp-admin/includes/plugin.php 2015-10-02 19:07:23 UTC (rev 34778)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -466,7 +466,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !is_multisite() )
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $plugins = get_site_option( 'active_sitewide_plugins');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $plugins = get_network_option( 'active_sitewide_plugins' );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset($plugins[$plugin]) )
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -524,7 +524,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() && ( $network_wide || is_network_only_plugin($plugin) ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $network_wide = true;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $current = get_site_option( 'active_sitewide_plugins', array() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $current = get_network_option( 'active_sitewide_plugins', array() );
</ins><span class="cx" style="display: block; padding: 0 10px"> $_GET['networkwide'] = 1; // Back compat for plugins looking for this value.
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $current = get_option( 'active_plugins', array() );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -577,9 +577,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $network_wide ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $current = get_site_option( 'active_sitewide_plugins', array() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $current = get_network_option( 'active_sitewide_plugins', array() );
</ins><span class="cx" style="display: block; padding: 0 10px"> $current[$plugin] = time();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_site_option( 'active_sitewide_plugins', $current );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_network_option( 'active_sitewide_plugins', $current );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $current = get_option( 'active_plugins', array() );
</span><span class="cx" style="display: block; padding: 0 10px"> $current[] = $plugin;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -628,7 +628,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function deactivate_plugins( $plugins, $silent = false, $network_wide = null ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $network_current = get_site_option( 'active_sitewide_plugins', array() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $network_current = get_network_option( 'active_sitewide_plugins', array() );
</ins><span class="cx" style="display: block; padding: 0 10px"> $current = get_option( 'active_plugins', array() );
</span><span class="cx" style="display: block; padding: 0 10px"> $do_blog = $do_network = false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -709,7 +709,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $do_blog )
</span><span class="cx" style="display: block; padding: 0 10px"> update_option('active_plugins', $current);
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $do_network )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_site_option( 'active_sitewide_plugins', $network_current );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_network_option( 'active_sitewide_plugins', $network_current );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -881,7 +881,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() && current_user_can( 'manage_network_plugins' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $network_plugins = (array) get_site_option( 'active_sitewide_plugins', array() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $network_plugins = (array) get_network_option( 'active_sitewide_plugins', array() );
</ins><span class="cx" style="display: block; padding: 0 10px"> $plugins = array_merge( $plugins, array_keys( $network_plugins ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesschemaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/schema.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/schema.php 2015-10-02 18:00:30 UTC (rev 34777)
+++ trunk/src/wp-admin/includes/schema.php 2015-10-02 19:07:23 UTC (rev 34778)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -935,7 +935,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $site_admins = get_site_option( 'site_admins' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $site_admins = get_network_option( 'site_admins' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Do not translate USERNAME, SITE_NAME, BLOG_URL, PASSWORD: those are placeholders. */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -985,10 +985,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // @todo - network admins should have a method of editing the network siteurl (used for cookie hash)
</span><span class="cx" style="display: block; padding: 0 10px"> 'siteurl' => get_option( 'siteurl' ) . '/',
</span><span class="cx" style="display: block; padding: 0 10px"> 'add_new_users' => '0',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'upload_space_check_disabled' => is_multisite() ? get_site_option( 'upload_space_check_disabled' ) : '1',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'upload_space_check_disabled' => is_multisite() ? get_network_option( 'upload_space_check_disabled' ) : '1',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'subdomain_install' => intval( $subdomain_install ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'global_terms_enabled' => global_terms_enabled() ? '1' : '0',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'ms_files_rewriting' => is_multisite() ? get_site_option( 'ms_files_rewriting' ) : '0',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'ms_files_rewriting' => is_multisite() ? get_network_option( 'ms_files_rewriting' ) : '0',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'initial_db_version' => get_option( 'initial_db_version' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'active_sitewide_plugins' => array(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'WPLANG' => get_locale(),
</span></span></pre></div>
<a id="trunksrcwpadminincludesupdatecorephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/update-core.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/update-core.php 2015-10-02 18:00:30 UTC (rev 34777)
+++ trunk/src/wp-admin/includes/update-core.php 2015-10-02 19:07:23 UTC (rev 34778)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1102,8 +1102,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( '_core_updated_successfully', $wp_version );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Clear the option that blocks auto updates after failures, now that we've been successful.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( function_exists( 'delete_site_option' ) )
- delete_site_option( 'auto_core_update_failed' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( function_exists( 'delete_network_option' ) )
+ delete_network_option( 'auto_core_update_failed' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $wp_version;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesupdatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/update.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/update.php 2015-10-02 18:00:30 UTC (rev 34777)
+++ trunk/src/wp-admin/includes/update.php 2015-10-02 19:07:23 UTC (rev 34778)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,7 +29,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_core_updates( $options = array() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $options = array_merge( array( 'available' => true, 'dismissed' => false ), $options );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $dismissed = get_site_option( 'dismissed_update_core' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $dismissed = get_network_option( 'dismissed_update_core' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_array( $dismissed ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $dismissed = array();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -134,9 +134,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function dismiss_core_update( $update ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $dismissed = get_site_option( 'dismissed_update_core' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $dismissed = get_network_option( 'dismissed_update_core' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $dismissed[ $update->current . '|' . $update->locale ] = true;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return update_site_option( 'dismissed_update_core', $dismissed );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return update_network_option( 'dismissed_update_core', $dismissed );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -146,14 +146,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function undismiss_core_update( $version, $locale ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $dismissed = get_site_option( 'dismissed_update_core' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $dismissed = get_network_option( 'dismissed_update_core' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $key = $version . '|' . $locale;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $dismissed[$key] ) )
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $dismissed[$key] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return update_site_option( 'dismissed_update_core', $dismissed );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return update_network_option( 'dismissed_update_core', $dismissed );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -478,7 +478,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $upgrading;
</span><span class="cx" style="display: block; padding: 0 10px"> $nag = isset( $upgrading );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $nag ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $failed = get_site_option( 'auto_core_update_failed' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $failed = get_network_option( 'auto_core_update_failed' );
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * If an update failed critically, we may have copied over version.php but not other files.
</span><span class="cx" style="display: block; padding: 0 10px"> * In that case, if the install claims we're running the version we attempted, nag.
</span></span></pre></div>
<a id="trunksrcwpadminincludesupgradephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/upgrade.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/upgrade.php 2015-10-02 18:00:30 UTC (rev 34777)
+++ trunk/src/wp-admin/includes/upgrade.php 2015-10-02 19:07:23 UTC (rev 34778)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -153,7 +153,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $first_post_guid = get_option( 'home' ) . '/?p=1';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $first_post = get_site_option( 'first_post' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $first_post = get_network_option( 'first_post' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty($first_post) )
</span><span class="cx" style="display: block; padding: 0 10px"> $first_post = __( 'Welcome to <a href="SITE_URL">SITE_NAME</a>. This is your first post. Edit or delete it, then start writing!' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -189,9 +189,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $first_comment = __('Hi, this is a comment.
</span><span class="cx" style="display: block; padding: 0 10px"> To delete a comment, just log in and view the post's comments. There you will have the option to edit or delete them.');
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $first_comment_author = get_site_option( 'first_comment_author', $first_comment_author );
- $first_comment_url = get_site_option( 'first_comment_url', network_home_url() );
- $first_comment = get_site_option( 'first_comment', $first_comment );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $first_comment_author = get_network_option( 'first_comment_author', $first_comment_author );
+ $first_comment_url = get_network_option( 'first_comment_url', network_home_url() );
+ $first_comment = get_network_option( 'first_comment', $first_comment );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->insert( $wpdb->comments, array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_post_ID' => 1,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -214,7 +214,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> As a new WordPress user, you should go to <a href=\"%s\">your dashboard</a> to delete this page and create new pages for your content. Have fun!" ), admin_url() );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $first_page = get_site_option( 'first_page', $first_page );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $first_page = get_network_option( 'first_page', $first_page );
</ins><span class="cx" style="display: block; padding: 0 10px"> $first_post_guid = get_option('home') . '/?page_id=2';
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->insert( $wpdb->posts, array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_author' => $user_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1255,8 +1255,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $wp_current_db_version < 15093 )
</span><span class="cx" style="display: block; padding: 0 10px"> populate_roles_300();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $wp_current_db_version < 14139 && is_multisite() && is_main_site() && ! defined( 'MULTISITE' ) && get_site_option( 'siteurl' ) === false )
- add_site_option( 'siteurl', '' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $wp_current_db_version < 14139 && is_multisite() && is_main_site() && ! defined( 'MULTISITE' ) && get_network_option( 'siteurl' ) === false )
+ add_network_option( 'siteurl', '' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // 3.0 screen options key name changes.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( wp_should_upgrade_global_tables() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1643,18 +1643,18 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // 2.8.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $wp_current_db_version < 11549 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wpmu_sitewide_plugins = get_site_option( 'wpmu_sitewide_plugins' );
- $active_sitewide_plugins = get_site_option( 'active_sitewide_plugins' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpmu_sitewide_plugins = get_network_option( 'wpmu_sitewide_plugins' );
+ $active_sitewide_plugins = get_network_option( 'active_sitewide_plugins' );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $wpmu_sitewide_plugins ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !$active_sitewide_plugins )
</span><span class="cx" style="display: block; padding: 0 10px"> $sitewide_plugins = (array) $wpmu_sitewide_plugins;
</span><span class="cx" style="display: block; padding: 0 10px"> else
</span><span class="cx" style="display: block; padding: 0 10px"> $sitewide_plugins = array_merge( (array) $active_sitewide_plugins, (array) $wpmu_sitewide_plugins );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_site_option( 'active_sitewide_plugins', $sitewide_plugins );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_network_option( 'active_sitewide_plugins', $sitewide_plugins );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- delete_site_option( 'wpmu_sitewide_plugins' );
- delete_site_option( 'deactivated_sitewide_plugins' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ delete_network_option( 'wpmu_sitewide_plugins' );
+ delete_network_option( 'deactivated_sitewide_plugins' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $start = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> while( $rows = $wpdb->get_results( "SELECT meta_key, meta_value FROM {$wpdb->sitemeta} ORDER BY meta_id LIMIT $start, 20" ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1663,7 +1663,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !@unserialize( $value ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $value = stripslashes( $value );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $value !== $row->meta_value ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_site_option( $row->meta_key, $value );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_network_option( $row->meta_key, $value );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $start += 20;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1672,22 +1672,22 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // 3.0
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $wp_current_db_version < 13576 )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_site_option( 'global_terms_enabled', '1' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_network_option( 'global_terms_enabled', '1' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // 3.3
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $wp_current_db_version < 19390 )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_site_option( 'initial_db_version', $wp_current_db_version );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_network_option( 'initial_db_version', $wp_current_db_version );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $wp_current_db_version < 19470 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false === get_site_option( 'active_sitewide_plugins' ) )
- update_site_option( 'active_sitewide_plugins', array() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( false === get_network_option( 'active_sitewide_plugins' ) )
+ update_network_option( 'active_sitewide_plugins', array() );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // 3.4
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $wp_current_db_version < 20148 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // 'allowedthemes' keys things by stylesheet. 'allowed_themes' keyed things by name.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $allowedthemes = get_site_option( 'allowedthemes' );
- $allowed_themes = get_site_option( 'allowed_themes' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $allowedthemes = get_network_option( 'allowedthemes' );
+ $allowed_themes = get_network_option( 'allowed_themes' );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( false === $allowedthemes && is_array( $allowed_themes ) && $allowed_themes ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $converted = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $themes = wp_get_themes();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1695,22 +1695,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $allowed_themes[ $theme_data->get('Name') ] ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $converted[ $stylesheet ] = true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_site_option( 'allowedthemes', $converted );
- delete_site_option( 'allowed_themes' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_network_option( 'allowedthemes', $converted );
+ delete_network_option( 'allowed_themes' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // 3.5
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $wp_current_db_version < 21823 )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_site_option( 'ms_files_rewriting', '1' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_network_option( 'ms_files_rewriting', '1' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // 3.5.2
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $wp_current_db_version < 24448 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $illegal_names = get_site_option( 'illegal_names' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $illegal_names = get_network_option( 'illegal_names' );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $illegal_names ) && count( $illegal_names ) === 1 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $illegal_name = reset( $illegal_names );
</span><span class="cx" style="display: block; padding: 0 10px"> $illegal_names = explode( ' ', $illegal_name );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_site_option( 'illegal_names', $illegal_names );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_network_option( 'illegal_names', $illegal_names );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminnetworksettingsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/network/settings.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/settings.php 2015-10-02 18:00:30 UTC (rev 34777)
+++ trunk/src/wp-admin/network/settings.php 2015-10-02 19:07:23 UTC (rev 34778)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,7 +76,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset($_POST[$option_name]) )
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> $value = wp_unslash( $_POST[$option_name] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_site_option( $option_name, $value );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_network_option( $option_name, $value );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -113,7 +113,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><label for="admin_email"><?php _e( 'Network Admin Email' ) ?></label></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input name="admin_email" type="email" id="admin_email" aria-describedby="admin-email-desc" class="regular-text" value="<?php echo esc_attr( get_site_option( 'admin_email' ) ) ?>" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input name="admin_email" type="email" id="admin_email" aria-describedby="admin-email-desc" class="regular-text" value="<?php echo esc_attr( get_network_option( 'admin_email' ) ) ?>" />
</ins><span class="cx" style="display: block; padding: 0 10px"> <p class="description" id="admin-email-desc">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'This email address will receive notifications. Registration and support emails will also come from this address.' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -125,9 +125,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><?php _e( 'Allow new registrations' ) ?></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !get_site_option( 'registration' ) )
- update_site_option( 'registration', 'none' );
- $reg = get_site_option( 'registration' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( !get_network_option( 'registration' ) )
+ update_network_option( 'registration', 'none' );
+ $reg = get_network_option( 'registration' );
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><span class="cx" style="display: block; padding: 0 10px"> <fieldset>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -146,25 +146,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><?php _e( 'Registration notification' ) ?></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !get_site_option( 'registrationnotification' ) )
- update_site_option( 'registrationnotification', 'yes' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( !get_network_option( 'registrationnotification' ) )
+ update_network_option( 'registrationnotification', 'yes' );
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label><input name="registrationnotification" type="checkbox" id="registrationnotification" value="yes"<?php checked( get_site_option( 'registrationnotification' ), 'yes' ) ?> /> <?php _e( 'Send the network admin an email notification every time someone registers a site or user account.' ) ?></label>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label><input name="registrationnotification" type="checkbox" id="registrationnotification" value="yes"<?php checked( get_network_option( 'registrationnotification' ), 'yes' ) ?> /> <?php _e( 'Send the network admin an email notification every time someone registers a site or user account.' ) ?></label>
</ins><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <tr id="addnewusers">
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><?php _e( 'Add New Users' ) ?></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label><input name="add_new_users" type="checkbox" id="add_new_users" value="1"<?php checked( get_site_option( 'add_new_users' ) ) ?> /> <?php _e( 'Allow site administrators to add new users to their site via the "Users → Add New" page.' ); ?></label>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label><input name="add_new_users" type="checkbox" id="add_new_users" value="1"<?php checked( get_network_option( 'add_new_users' ) ) ?> /> <?php _e( 'Allow site administrators to add new users to their site via the "Users → Add New" page.' ); ?></label>
</ins><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><label for="illegal_names"><?php _e( 'Banned Names' ) ?></label></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input name="illegal_names" type="text" id="illegal_names" aria-describedby="illegal-names-desc" class="large-text" value="<?php echo esc_attr( implode( " ", (array) get_site_option( 'illegal_names' ) ) ); ?>" size="45" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input name="illegal_names" type="text" id="illegal_names" aria-describedby="illegal-names-desc" class="large-text" value="<?php echo esc_attr( implode( " ", (array) get_network_option( 'illegal_names' ) ) ); ?>" size="45" />
</ins><span class="cx" style="display: block; padding: 0 10px"> <p class="description" id="illegal-names-desc">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'Users are not allowed to register these sites. Separate names by spaces.' ) ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -174,7 +174,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><label for="limited_email_domains"><?php _e( 'Limited Email Registrations' ) ?></label></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php $limited_email_domains = get_site_option( 'limited_email_domains' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php $limited_email_domains = get_network_option( 'limited_email_domains' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $limited_email_domains = str_replace( ' ', "\n", $limited_email_domains ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <textarea name="limited_email_domains" id="limited_email_domains" aria-describedby="limited-email-domains-desc" cols="45" rows="5">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php echo esc_textarea( $limited_email_domains == '' ? '' : implode( "\n", (array) $limited_email_domains ) ); ?></textarea>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -188,7 +188,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><label for="banned_email_domains"><?php _e('Banned Email Domains') ?></label></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><span class="cx" style="display: block; padding: 0 10px"> <textarea name="banned_email_domains" id="banned_email_domains" aria-describedby="banned-email-domains-desc" cols="45" rows="5">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php echo esc_textarea( get_site_option( 'banned_email_domains' ) == '' ? '' : implode( "\n", (array) get_site_option( 'banned_email_domains' ) ) ); ?></textarea>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php echo esc_textarea( get_network_option( 'banned_email_domains' ) == '' ? '' : implode( "\n", (array) get_network_option( 'banned_email_domains' ) ) ); ?></textarea>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p class="description" id="banned-email-domains-desc">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'If you want to ban domains from site registrations. One domain per line.' ) ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -203,7 +203,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><label for="welcome_email"><?php _e( 'Welcome Email' ) ?></label></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><span class="cx" style="display: block; padding: 0 10px"> <textarea name="welcome_email" id="welcome_email" aria-describedby="welcome-email-desc" rows="5" cols="45" class="large-text">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php echo esc_textarea( get_site_option( 'welcome_email' ) ) ?></textarea>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php echo esc_textarea( get_network_option( 'welcome_email' ) ) ?></textarea>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p class="description" id="welcome-email-desc">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'The welcome email sent to new site owners.' ) ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -213,7 +213,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><label for="welcome_user_email"><?php _e( 'Welcome User Email' ) ?></label></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><span class="cx" style="display: block; padding: 0 10px"> <textarea name="welcome_user_email" id="welcome_user_email" aria-describedby="welcome-user-email-desc" rows="5" cols="45" class="large-text">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php echo esc_textarea( get_site_option( 'welcome_user_email' ) ) ?></textarea>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php echo esc_textarea( get_network_option( 'welcome_user_email' ) ) ?></textarea>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p class="description" id="welcome-user-email-desc">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'The welcome email sent to new users.' ) ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -223,7 +223,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><label for="first_post"><?php _e( 'First Post' ) ?></label></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><span class="cx" style="display: block; padding: 0 10px"> <textarea name="first_post" id="first_post" aria-describedby="first-post-desc" rows="5" cols="45" class="large-text">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php echo esc_textarea( get_site_option( 'first_post' ) ) ?></textarea>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php echo esc_textarea( get_network_option( 'first_post' ) ) ?></textarea>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p class="description" id="first-post-desc">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'The first post on a new site.' ) ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -233,7 +233,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><label for="first_page"><?php _e( 'First Page' ) ?></label></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><span class="cx" style="display: block; padding: 0 10px"> <textarea name="first_page" id="first_page" aria-describedby="first-page-desc" rows="5" cols="45" class="large-text">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php echo esc_textarea( get_site_option( 'first_page' ) ) ?></textarea>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php echo esc_textarea( get_network_option( 'first_page' ) ) ?></textarea>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p class="description" id="first-page-desc">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'The first page on a new site.' ) ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -243,7 +243,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><label for="first_comment"><?php _e( 'First Comment' ) ?></label></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><span class="cx" style="display: block; padding: 0 10px"> <textarea name="first_comment" id="first_comment" aria-describedby="first-comment-desc" rows="5" cols="45" class="large-text">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php echo esc_textarea( get_site_option( 'first_comment' ) ) ?></textarea>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php echo esc_textarea( get_network_option( 'first_comment' ) ) ?></textarea>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p class="description" id="first-comment-desc">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'The first comment on a new site.' ) ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -252,7 +252,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><label for="first_comment_author"><?php _e( 'First Comment Author' ) ?></label></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input type="text" size="40" name="first_comment_author" id="first_comment_author" aria-describedby="first-comment-author-desc" value="<?php echo get_site_option('first_comment_author') ?>" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input type="text" size="40" name="first_comment_author" id="first_comment_author" aria-describedby="first-comment-author-desc" value="<?php echo get_network_option( 'first_comment_author' ) ?>" />
</ins><span class="cx" style="display: block; padding: 0 10px"> <p class="description" id="first-comment-author-desc">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'The author of the first comment on a new site.' ) ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -261,7 +261,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><label for="first_comment_url"><?php _e( 'First Comment URL' ) ?></label></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input type="text" size="40" name="first_comment_url" id="first_comment_url" aria-describedby="first-comment-url-desc" value="<?php echo esc_attr( get_site_option( 'first_comment_url' ) ) ?>" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input type="text" size="40" name="first_comment_url" id="first_comment_url" aria-describedby="first-comment-url-desc" value="<?php echo esc_attr( get_network_option( 'first_comment_url' ) ) ?>" />
</ins><span class="cx" style="display: block; padding: 0 10px"> <p class="description" id="first-comment-url-desc">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'The URL for the first comment on a new site.' ) ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -273,7 +273,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><?php _e( 'Site upload space' ) ?></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label><input type="checkbox" id="upload_space_check_disabled" name="upload_space_check_disabled" value="0"<?php checked( get_site_option( 'upload_space_check_disabled' ), 0 ) ?>/> <?php printf( __( 'Limit total size of files uploaded to %s MB' ), '</label><label><input name="blog_upload_space" type="number" min="0" style="width: 100px" id="blog_upload_space" aria-describedby="blog-upload-space-desc" value="' . esc_attr( get_site_option('blog_upload_space', 100) ) . '" />' ); ?></label><br />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label><input type="checkbox" id="upload_space_check_disabled" name="upload_space_check_disabled" value="0"<?php checked( get_network_option( 'upload_space_check_disabled' ), 0 ) ?>/> <?php printf( __( 'Limit total size of files uploaded to %s MB' ), '</label><label><input name="blog_upload_space" type="number" min="0" style="width: 100px" id="blog_upload_space" aria-describedby="blog-upload-space-desc" value="' . esc_attr( get_network_option('blog_upload_space', 100) ) . '" />' ); ?></label><br />
</ins><span class="cx" style="display: block; padding: 0 10px"> <p class="screen-reader-text" id="blog-upload-space-desc">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'Size in megabytes' ) ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -283,7 +283,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><label for="upload_filetypes"><?php _e( 'Upload file types' ) ?></label></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input name="upload_filetypes" type="text" id="upload_filetypes" aria-describedby="upload-filetypes-desc" class="large-text" value="<?php echo esc_attr( get_site_option( 'upload_filetypes', 'jpg jpeg png gif' ) ) ?>" size="45" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input name="upload_filetypes" type="text" id="upload_filetypes" aria-describedby="upload-filetypes-desc" class="large-text" value="<?php echo esc_attr( get_network_option( 'upload_filetypes', 'jpg jpeg png gif' ) ) ?>" size="45" />
</ins><span class="cx" style="display: block; padding: 0 10px"> <p class="description" id="upload-filetypes-desc">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'Allowed file types. Separate types by spaces.' ) ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -293,7 +293,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><label for="fileupload_maxk"><?php _e( 'Max upload file size' ) ?></label></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php printf( _x( '%s KB', 'File size in kilobytes' ), '<input name="fileupload_maxk" type="number" min="0" style="width: 100px" id="fileupload_maxk" aria-describedby="fileupload-maxk-desc" value="' . esc_attr( get_site_option( 'fileupload_maxk', 300 ) ) . '" />' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php printf( _x( '%s KB', 'File size in kilobytes' ), '<input name="fileupload_maxk" type="number" min="0" style="width: 100px" id="fileupload_maxk" aria-describedby="fileupload-maxk-desc" value="' . esc_attr( get_network_option( 'fileupload_maxk', 300 ) ) . '" />' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p class="screen-reader-text" id="fileupload-maxk-desc">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'Size in kilobytes' ) ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -312,7 +312,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <th><label for="WPLANG"><?php _e( 'Default Language' ); ?></label></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $lang = get_site_option( 'WPLANG' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $lang = get_network_option( 'WPLANG' );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! in_array( $lang, $languages ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $lang = '';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -339,7 +339,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><?php _e( 'Enable administration menus' ); ?></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $menu_perms = get_site_option( 'menu_items' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $menu_perms = get_network_option( 'menu_items' );
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filter available network-wide administration menu options.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunksrcwpadminnetworksitenewphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/network/site-new.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/site-new.php 2015-10-02 18:00:30 UTC (rev 34777)
+++ trunk/src/wp-admin/network/site-new.php 2015-10-02 19:07:23 UTC (rev 34778)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -123,7 +123,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> get_site_url( $id ),
</span><span class="cx" style="display: block; padding: 0 10px"> wp_unslash( $title )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_mail( get_site_option('admin_email'), sprintf( __( '[%s] New Site Created' ), $current_site->site_name ), $content_mail, 'From: "Site Admin" <' . get_site_option( 'admin_email' ) . '>' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_mail( get_network_option( 'admin_email' ), sprintf( __( '[%s] New Site Created' ), $current_site->site_name ), $content_mail, 'From: "Site Admin" <' . get_network_option( 'admin_email' ) . '>' );
</ins><span class="cx" style="display: block; padding: 0 10px"> wpmu_welcome_notification( $id, $user_id, $password, $title, array( 'public' => 1 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_redirect( add_query_arg( array( 'update' => 'added', 'id' => $id ), 'site-new.php' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> exit;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -188,7 +188,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> // Network default.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $lang = get_site_option( 'WPLANG' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $lang = get_network_option( 'WPLANG' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Use English if the default isn't available.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! in_array( $lang, $languages ) ) {
</span></span></pre></div>
<a id="trunksrcwpadminnetworkthemesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/network/themes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/themes.php 2015-10-02 18:00:30 UTC (rev 34777)
+++ trunk/src/wp-admin/network/themes.php 2015-10-02 19:07:23 UTC (rev 34778)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,12 +29,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $referer = remove_query_arg( $temp_args, wp_get_referer() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $action ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $allowed_themes = get_site_option( 'allowedthemes' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $allowed_themes = get_network_option( 'allowedthemes' );
</ins><span class="cx" style="display: block; padding: 0 10px"> switch ( $action ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'enable':
</span><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer('enable-theme_' . $_GET['theme']);
</span><span class="cx" style="display: block; padding: 0 10px"> $allowed_themes[ $_GET['theme'] ] = true;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_site_option( 'allowedthemes', $allowed_themes );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_network_option( 'allowedthemes', $allowed_themes );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( false === strpos( $referer, '/network/themes.php' ) )
</span><span class="cx" style="display: block; padding: 0 10px"> wp_redirect( network_admin_url( 'themes.php?enabled=1' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> else
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -43,7 +43,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> case 'disable':
</span><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer('disable-theme_' . $_GET['theme']);
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $allowed_themes[ $_GET['theme'] ] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_site_option( 'allowedthemes', $allowed_themes );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_network_option( 'allowedthemes', $allowed_themes );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_safe_redirect( add_query_arg( 'disabled', '1', $referer ) );
</span><span class="cx" style="display: block; padding: 0 10px"> exit;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'enable-selected':
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -55,7 +55,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $themes as $theme )
</span><span class="cx" style="display: block; padding: 0 10px"> $allowed_themes[ $theme ] = true;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_site_option( 'allowedthemes', $allowed_themes );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_network_option( 'allowedthemes', $allowed_themes );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_safe_redirect( add_query_arg( 'enabled', count( $themes ), $referer ) );
</span><span class="cx" style="display: block; padding: 0 10px"> exit;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'disable-selected':
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,7 +67,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $themes as $theme )
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $allowed_themes[ $theme ] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_site_option( 'allowedthemes', $allowed_themes );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_network_option( 'allowedthemes', $allowed_themes );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_safe_redirect( add_query_arg( 'disabled', count( $themes ), $referer ) );
</span><span class="cx" style="display: block; padding: 0 10px"> exit;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'update-selected' :
</span></span></pre></div>
<a id="trunksrcwpadminnetworkupgradephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/network/upgrade.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/upgrade.php 2015-10-02 18:00:30 UTC (rev 34777)
+++ trunk/src/wp-admin/network/upgrade.php 2015-10-02 19:07:23 UTC (rev 34778)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,7 +52,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @global string $wp_db_version
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_db_version;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_site_option( 'wpmu_upgrade_site', $wp_db_version );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_network_option( 'wpmu_upgrade_site', $wp_db_version );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $blogs = $wpdb->get_results( "SELECT blog_id FROM {$wpdb->blogs} WHERE site_id = '{$wpdb->siteid}' AND spam = '0' AND deleted = '0' AND archived = '0' ORDER BY registered DESC LIMIT {$n}, 5", ARRAY_A );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -109,7 +109,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'show':
</span><span class="cx" style="display: block; padding: 0 10px"> default:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( get_site_option( 'wpmu_upgrade_site' ) != $GLOBALS['wp_db_version'] ) :
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( get_network_option( 'wpmu_upgrade_site' ) != $GLOBALS['wp_db_version'] ) :
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <h2><?php _e( 'Database Upgrade Required' ); ?></h2>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'WordPress has been updated! Before we send you on your way, we need to individually upgrade the sites in your network.' ); ?></p>
</span></span></pre></div>
<a id="trunksrcwpadminoptionswritingphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/options-writing.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/options-writing.php 2015-10-02 18:00:30 UTC (rev 34777)
+++ trunk/src/wp-admin/options-writing.php 2015-10-02 19:07:23 UTC (rev 34778)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,7 +56,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php settings_fields('writing'); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <table class="form-table">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php if ( get_site_option( 'initial_db_version' ) < 32453 ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php if ( get_network_option( 'initial_db_version' ) < 32453 ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><?php _e('Formatting') ?></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td><fieldset><legend class="screen-reader-text"><span><?php _e('Formatting') ?></span></legend>
</span></span></pre></div>
<a id="trunksrcwpadminoptionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/options.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/options.php 2015-10-02 18:00:30 UTC (rev 34777)
+++ trunk/src/wp-admin/options.php 2015-10-02 19:07:23 UTC (rev 34778)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -95,7 +95,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! in_array( get_option( 'blog_charset' ), array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ) ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $whitelist_options['reading'][] = 'blog_charset';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( get_site_option( 'initial_db_version' ) < 32453 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( get_network_option( 'initial_db_version' ) < 32453 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $whitelist_options['writing'][] = 'use_smilies';
</span><span class="cx" style="display: block; padding: 0 10px"> $whitelist_options['writing'][] = 'use_balanceTags';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminplugineditorphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/plugin-editor.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/plugin-editor.php 2015-10-02 18:00:30 UTC (rev 34777)
+++ trunk/src/wp-admin/plugin-editor.php 2015-10-02 19:07:23 UTC (rev 34778)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -74,7 +74,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_network_admin() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'recently_activated', array( $file => time() ) + (array) get_option( 'recently_activated' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_site_option( 'recently_activated', array( $file => time() ) + (array) get_site_option( 'recently_activated' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_network_option( 'recently_activated', array( $file => time() ) + (array) get_network_option( 'recently_activated' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_redirect(add_query_arg('_wpnonce', wp_create_nonce('edit-plugin-test_' . $file), "plugin-editor.php?file=$file&liveupdate=1&scrollto=$scrollto&networkwide=" . $network_wide));
</span></span></pre></div>
<a id="trunksrcwpadminpluginsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/plugins.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/plugins.php 2015-10-02 18:00:30 UTC (rev 34777)
+++ trunk/src/wp-admin/plugins.php 2015-10-02 19:07:23 UTC (rev 34778)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -55,9 +55,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $recent[ $plugin ] );
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'recently_activated', $recent );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $recent = (array) get_site_option( 'recently_activated' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $recent = (array) get_network_option( 'recently_activated' );
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $recent[ $plugin ] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_site_option( 'recently_activated', $recent );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_network_option( 'recently_activated', $recent );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset($_GET['from']) && 'import' == $_GET['from'] ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -101,7 +101,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_network_admin() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $recent = (array) get_option('recently_activated' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $recent = (array) get_site_option('recently_activated' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $recent = (array) get_network_option( 'recently_activated' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $plugins as $plugin ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -111,7 +111,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_network_admin() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'recently_activated', $recent );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_site_option( 'recently_activated', $recent );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_network_option( 'recently_activated', $recent );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_redirect( self_admin_url("plugins.php?activate-multi=true&plugin_status=$status&paged=$page&s=$s") );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -182,7 +182,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_network_admin() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'recently_activated', array( $plugin => time() ) + (array) get_option( 'recently_activated' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_site_option( 'recently_activated', array( $plugin => time() ) + (array) get_site_option( 'recently_activated' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_network_option( 'recently_activated', array( $plugin => time() ) + (array) get_network_option( 'recently_activated' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( headers_sent() )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -220,7 +220,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_network_admin() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'recently_activated', $deactivated + (array) get_option( 'recently_activated' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_site_option( 'recently_activated', $deactivated + (array) get_site_option( 'recently_activated' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_network_option( 'recently_activated', $deactivated + (array) get_network_option( 'recently_activated' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_redirect( self_admin_url("plugins.php?deactivate-multi=true&plugin_status=$status&paged=$page&s=$s") );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -382,7 +382,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_network_admin() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'recently_activated', array() );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_site_option( 'recently_activated', array() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_network_option( 'recently_activated', array() );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminusereditphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/user-edit.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/user-edit.php 2015-10-02 18:00:30 UTC (rev 34777)
+++ trunk/src/wp-admin/user-edit.php 2015-10-02 19:07:23 UTC (rev 34778)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -316,7 +316,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() && is_network_admin() && ! IS_PROFILE_PAGE && current_user_can( 'manage_network_options' ) && !isset($super_admins) ) { ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr class="user-super-admin-wrap"><th><?php _e('Super Admin'); ?></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php if ( $profileuser->user_email != get_site_option( 'admin_email' ) || ! is_super_admin( $profileuser->ID ) ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php if ( $profileuser->user_email != get_network_option( 'admin_email' ) || ! is_super_admin( $profileuser->ID ) ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p><label><input type="checkbox" id="super_admin" name="super_admin"<?php checked( is_super_admin( $profileuser->ID ) ); ?> /> <?php _e( 'Grant this user super admin privileges for the Network.' ); ?></label></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'Super admin privileges cannot be removed because this user has the network admin email.' ); ?></p>
</span></span></pre></div>
<a id="trunksrcwpincludescapabilitiesfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/capabilities-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/capabilities-functions.php 2015-10-02 18:00:30 UTC (rev 34777)
+++ trunk/src/wp-includes/capabilities-functions.php 2015-10-02 19:07:23 UTC (rev 34778)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -336,7 +336,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $caps[] = $cap;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // update_, install_, and delete_ are handled above with is_super_admin().
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $menu_perms = get_site_option( 'menu_items', array() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $menu_perms = get_network_option( 'menu_items', array() );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $menu_perms['plugins'] ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $caps[] = 'manage_network_plugins';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -352,7 +352,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> case 'create_users':
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !is_multisite() )
</span><span class="cx" style="display: block; padding: 0 10px"> $caps[] = $cap;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- elseif ( is_super_admin( $user_id ) || get_site_option( 'add_new_users' ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ elseif ( is_super_admin( $user_id ) || get_network_option( 'add_new_users' ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> $caps[] = $cap;
</span><span class="cx" style="display: block; padding: 0 10px"> else
</span><span class="cx" style="display: block; padding: 0 10px"> $caps[] = 'do_not_allow';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -578,7 +578,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset($super_admins) )
</span><span class="cx" style="display: block; padding: 0 10px"> return $super_admins;
</span><span class="cx" style="display: block; padding: 0 10px"> else
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return get_site_option( 'site_admins', array('admin') );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return get_network_option( 'site_admins', array('admin') );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpthemephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-theme.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-theme.php 2015-10-02 18:00:30 UTC (rev 34777)
+++ trunk/src/wp-includes/class-wp-theme.php 2015-10-02 19:07:23 UTC (rev 34778)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1191,7 +1191,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public static function get_allowed_on_network() {
</span><span class="cx" style="display: block; padding: 0 10px"> static $allowed_themes;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $allowed_themes ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $allowed_themes = (array) get_site_option( 'allowedthemes' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $allowed_themes = (array) get_network_option( 'allowedthemes' );
</ins><span class="cx" style="display: block; padding: 0 10px"> return $allowed_themes;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesdefaultconstantsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/default-constants.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/default-constants.php 2015-10-02 18:00:30 UTC (rev 34777)
+++ trunk/src/wp-includes/default-constants.php 2015-10-02 19:07:23 UTC (rev 34778)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -189,7 +189,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !defined( 'COOKIEHASH' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $siteurl = get_site_option( 'siteurl' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $siteurl = get_network_option( 'siteurl' );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $siteurl )
</span><span class="cx" style="display: block; padding: 0 10px"> define( 'COOKIEHASH', md5( $siteurl ) );
</span><span class="cx" style="display: block; padding: 0 10px"> else
</span></span></pre></div>
<a id="trunksrcwpincludesfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/functions.php 2015-10-02 18:00:30 UTC (rev 34777)
+++ trunk/src/wp-includes/functions.php 2015-10-02 19:07:23 UTC (rev 34778)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1762,7 +1762,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Honor the value of UPLOADS. This happens as long as ms-files rewriting is disabled.
</span><span class="cx" style="display: block; padding: 0 10px"> * We also sometimes obey UPLOADS when rewriting is enabled -- see the next block.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( defined( 'UPLOADS' ) && ! ( is_multisite() && get_site_option( 'ms_files_rewriting' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( defined( 'UPLOADS' ) && ! ( is_multisite() && get_network_option( 'ms_files_rewriting' ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $dir = ABSPATH . UPLOADS;
</span><span class="cx" style="display: block; padding: 0 10px"> $url = trailingslashit( $siteurl ) . UPLOADS;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1770,7 +1770,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // If multisite (and if not the main site in a post-MU network)
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() && ! ( is_main_network() && is_main_site() && defined( 'MULTISITE' ) ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! get_site_option( 'ms_files_rewriting' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! get_network_option( 'ms_files_rewriting' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * If ms-files rewriting is disabled (networks created post-3.5), it is fairly
</span><span class="cx" style="display: block; padding: 0 10px"> * straightforward: Append sites/%d if we're not on the main site (for post-MU
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4003,7 +4003,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_null( $filter ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $global_terms = (bool) $filter;
</span><span class="cx" style="display: block; padding: 0 10px"> else
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $global_terms = (bool) get_site_option( 'global_terms_enabled', false );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $global_terms = (bool) get_network_option( 'global_terms_enabled', false );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return $global_terms;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesl10nphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/l10n.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/l10n.php 2015-10-02 18:00:30 UTC (rev 34777)
+++ trunk/src/wp-includes/l10n.php 2015-10-02 19:07:23 UTC (rev 34778)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,7 +54,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Don't check blog option when installing.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( defined( 'WP_INSTALLING' ) || ( false === $ms_locale = get_option( 'WPLANG' ) ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $ms_locale = get_site_option( 'WPLANG' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $ms_locale = get_network_option( 'WPLANG' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $ms_locale !== false ) {
</span></span></pre></div>
<a id="trunksrcwpincludesmsdefaultconstantsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/ms-default-constants.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-default-constants.php 2015-10-02 18:00:30 UTC (rev 34777)
+++ trunk/src/wp-includes/ms-default-constants.php 2015-10-02 19:07:23 UTC (rev 34778)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,7 +23,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // This filter is attached in ms-default-filters.php but that file is not included during SHORTINIT.
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'default_site_option_ms_files_rewriting', '__return_true' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! get_site_option( 'ms_files_rewriting' ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! get_network_option( 'ms_files_rewriting' ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Base uploads dir relative to ABSPATH
</span></span></pre></div>
<a id="trunksrcwpincludesmsdeprecatedphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/ms-deprecated.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-deprecated.php 2015-10-02 18:00:30 UTC (rev 34777)
+++ trunk/src/wp-includes/ms-deprecated.php 2015-10-02 19:07:23 UTC (rev 34778)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,7 +25,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_dashboard_blog() {
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_function( __FUNCTION__, '3.1' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $blog = get_site_option( 'dashboard_blog' ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $blog = get_network_option( 'dashboard_blog' ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> return get_blog_details( $blog );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return get_blog_details( $GLOBALS['current_site']->blog_id );
</span></span></pre></div>
<a id="trunksrcwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/ms-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-functions.php 2015-10-02 18:00:30 UTC (rev 34777)
+++ trunk/src/wp-includes/ms-functions.php 2015-10-02 19:07:23 UTC (rev 34778)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,7 +100,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return int
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_user_count() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return get_site_option( 'user_count' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return get_network_option( 'user_count' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -117,7 +117,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( func_num_args() )
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument( __FUNCTION__, '3.1' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return get_site_option( 'blog_count' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return get_network_option( 'blog_count' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -344,7 +344,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool Returns true when the email address is banned.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function is_email_address_unsafe( $user_email ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $banned_names = get_site_option( 'banned_email_domains' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $banned_names = get_network_option( 'banned_email_domains' );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $banned_names && ! is_array( $banned_names ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $banned_names = explode( "\n", $banned_names );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -422,10 +422,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $user_name ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $errors->add('user_name', __( 'Please enter a username.' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $illegal_names = get_site_option( 'illegal_names' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $illegal_names = get_network_option( 'illegal_names' );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_array( $illegal_names ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $illegal_names = array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_site_option( 'illegal_names', $illegal_names );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_network_option( 'illegal_names', $illegal_names );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( $user_name, $illegal_names ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $errors->add('user_name', __( 'That username is not allowed.' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -450,7 +450,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !is_email( $user_email ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $errors->add('user_email', __( 'Please enter a valid email address.' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $limited_email_domains = get_site_option( 'limited_email_domains' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $limited_email_domains = get_network_option( 'limited_email_domains' );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $limited_email_domains ) && ! empty( $limited_email_domains ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $emaildomain = substr( $user_email, 1 + strpos( $user_email, '@' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! in_array( $emaildomain, $limited_email_domains ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -544,10 +544,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_title = strip_tags( $blog_title );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $errors = new WP_Error();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $illegal_names = get_site_option( 'illegal_names' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $illegal_names = get_network_option( 'illegal_names' );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $illegal_names == false ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $illegal_names = array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_site_option( 'illegal_names', $illegal_names );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_network_option( 'illegal_names', $illegal_names );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -801,10 +801,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $activate_url = "http://{$domain}{$path}wp-activate.php?key=$key"; // @todo use *_url() API
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $activate_url = esc_url($activate_url);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $admin_email = get_site_option( 'admin_email' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $admin_email = get_network_option( 'admin_email' );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $admin_email == '' )
</span><span class="cx" style="display: block; padding: 0 10px"> $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $from_name = get_network_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_network_option( 'site_name' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
</span><span class="cx" style="display: block; padding: 0 10px"> $message = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -894,10 +894,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Send email with activation link.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $admin_email = get_site_option( 'admin_email' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $admin_email = get_network_option( 'admin_email' );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $admin_email == '' )
</span><span class="cx" style="display: block; padding: 0 10px"> $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $from_name = get_network_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_network_option( 'site_name' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
</span><span class="cx" style="display: block; padding: 0 10px"> $message = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1135,7 +1135,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( $key, $value );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_option( 'WPLANG', get_site_option( 'WPLANG' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_option( 'WPLANG', get_network_option( 'WPLANG' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> update_option( 'blog_public', (int) $meta['public'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_super_admin( $user_id ) && ! get_user_meta( $user_id, 'primary_blog', true ) )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1171,10 +1171,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function newblog_notify_siteadmin( $blog_id, $deprecated = '' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( get_site_option( 'registrationnotification' ) != 'yes' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( get_network_option( 'registrationnotification' ) != 'yes' )
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $email = get_site_option( 'admin_email' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $email = get_network_option( 'admin_email' );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_email($email) == false )
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1216,10 +1216,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function newuser_notify_siteadmin( $user_id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( get_site_option( 'registrationnotification' ) != 'yes' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( get_network_option( 'registrationnotification' ) != 'yes' )
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $email = get_site_option( 'admin_email' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $email = get_network_option( 'admin_email' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_email($email) == false )
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1355,7 +1355,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'siteurl', $url );
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'home', $url );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( get_site_option( 'ms_files_rewriting' ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( get_network_option( 'ms_files_rewriting' ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> update_option( 'upload_path', UPLOADBLOGSDIR . "/$blog_id/files" );
</span><span class="cx" style="display: block; padding: 0 10px"> else
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'upload_path', get_blog_option( get_current_site()->blog_id, 'upload_path' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1431,7 +1431,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! apply_filters( 'wpmu_welcome_notification', $blog_id, $user_id, $password, $title, $meta ) )
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $welcome_email = get_site_option( 'welcome_email' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $welcome_email = get_network_option( 'welcome_email' );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $welcome_email == false ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Do not translate USERNAME, SITE_NAME, BLOG_URL, PASSWORD: those are placeholders. */
</span><span class="cx" style="display: block; padding: 0 10px"> $welcome_email = __( 'Howdy USERNAME,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1474,12 +1474,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $meta Signup meta data.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $welcome_email = apply_filters( 'update_welcome_email', $welcome_email, $blog_id, $user_id, $password, $title, $meta );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $admin_email = get_site_option( 'admin_email' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $admin_email = get_network_option( 'admin_email' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $admin_email == '' )
</span><span class="cx" style="display: block; padding: 0 10px"> $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $from_name = get_network_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_network_option( 'site_name' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
</span><span class="cx" style="display: block; padding: 0 10px"> $message = $welcome_email;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1530,7 +1530,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! apply_filters( 'wpmu_welcome_user_notification', $user_id, $password, $meta ) )
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $welcome_email = get_site_option( 'welcome_user_email' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $welcome_email = get_network_option( 'welcome_user_email' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $user = get_userdata( $user_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1552,12 +1552,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $welcome_email = str_replace( 'PASSWORD', $password, $welcome_email );
</span><span class="cx" style="display: block; padding: 0 10px"> $welcome_email = str_replace( 'LOGINLINK', wp_login_url(), $welcome_email );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $admin_email = get_site_option( 'admin_email' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $admin_email = get_network_option( 'admin_email' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $admin_email == '' )
</span><span class="cx" style="display: block; padding: 0 10px"> $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $from_name = get_network_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_network_option( 'site_name' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
</span><span class="cx" style="display: block; padding: 0 10px"> $message = $welcome_email;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1729,7 +1729,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function check_upload_mimes( $mimes ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $site_exts = explode( ' ', get_site_option( 'upload_filetypes', 'jpg jpeg png gif' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $site_exts = explode( ' ', get_network_option( 'upload_filetypes', 'jpg jpeg png gif' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $site_mimes = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $site_exts as $ext ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $mimes as $ext_pattern => $mime ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1870,11 +1870,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string|array If the upload is under the size limit, $upload is returned. Otherwise returns an error message.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function upload_is_file_too_big( $upload ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_array( $upload ) || defined( 'WP_IMPORTING' ) || get_site_option( 'upload_space_check_disabled' ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! is_array( $upload ) || defined( 'WP_IMPORTING' ) || get_network_option( 'upload_space_check_disabled' ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> return $upload;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( strlen( $upload['bits'] ) > ( 1024 * get_site_option( 'fileupload_maxk', 1500 ) ) )
- return sprintf( __( 'This file is too big. Files must be less than %d KB in size.' ) . '<br />', get_site_option( 'fileupload_maxk', 1500 ));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( strlen( $upload['bits'] ) > ( 1024 * get_network_option( 'fileupload_maxk', 1500 ) ) )
+ return sprintf( __( 'This file is too big. Files must be less than %d KB in size.' ) . '<br />', get_network_option( 'fileupload_maxk', 1500 ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $upload;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2087,7 +2087,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function users_can_register_signup_filter() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $registration = get_site_option('registration');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $registration = get_network_option( 'registration' );
</ins><span class="cx" style="display: block; padding: 0 10px"> return ( $registration == 'all' || $registration == 'user' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2116,7 +2116,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> Thanks!
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> --The Team @ SITE_NAME' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_site_option( 'welcome_user_email', $text );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_network_option( 'welcome_user_email', $text );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return $text;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2242,7 +2242,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(blog_id) as c FROM $wpdb->blogs WHERE site_id = %d AND spam = '0' AND deleted = '0' and archived = '0'", $wpdb->siteid) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_site_option( 'blog_count', $count );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_network_option( 'blog_count', $count );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2256,7 +2256,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $count = $wpdb->get_var( "SELECT COUNT(ID) as c FROM $wpdb->users WHERE spam = '0' AND deleted = '0'" );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_site_option( 'user_count', $count );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_network_option( 'user_count', $count );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2294,7 +2294,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $space_allowed = get_option( 'blog_upload_space' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_numeric( $space_allowed ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $space_allowed = get_site_option( 'blog_upload_space' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $space_allowed = get_network_option( 'blog_upload_space' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $space_allowed ) || ! is_numeric( $space_allowed ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $space_allowed = 100;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2322,7 +2322,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $allowed = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $space_allowed = $allowed * 1024 * 1024;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( get_site_option( 'upload_space_check_disabled' ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( get_network_option( 'upload_space_check_disabled' ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> return $space_allowed;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $space_used = get_space_used() * 1024 * 1024;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2340,7 +2340,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool True if space is available, false otherwise.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function is_upload_space_available() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( get_site_option( 'upload_space_check_disabled' ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( get_network_option( 'upload_space_check_disabled' ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return (bool) get_upload_space_available();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2352,8 +2352,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return int of upload size limit in bytes
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function upload_size_limit_filter( $size ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $fileupload_maxk = 1024 * get_site_option( 'fileupload_maxk', 1500 );
- if ( get_site_option( 'upload_space_check_disabled' ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $fileupload_maxk = 1024 * get_network_option( 'fileupload_maxk', 1500 );
+ if ( get_network_option( 'upload_space_check_disabled' ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> return min( $size, $fileupload_maxk );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return min( $size, $fileupload_maxk, get_upload_space_available() );
</span></span></pre></div>
<a id="trunksrcwpincludesmsloadphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/ms-load.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-load.php 2015-10-02 18:00:30 UTC (rev 34777)
+++ trunk/src/wp-includes/ms-load.php 2015-10-02 19:07:23 UTC (rev 34778)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,7 +34,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array Files to include.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_get_active_network_plugins() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $active_plugins = (array) get_site_option( 'active_sitewide_plugins', array() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $active_plugins = (array) get_network_option( 'active_sitewide_plugins', array() );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $active_plugins ) )
</span><span class="cx" style="display: block; padding: 0 10px"> return array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -96,7 +96,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( file_exists( WP_CONTENT_DIR . '/blog-inactive.php' ) )
</span><span class="cx" style="display: block; padding: 0 10px"> return WP_CONTENT_DIR . '/blog-inactive.php';
</span><span class="cx" style="display: block; padding: 0 10px"> else
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( sprintf( __( 'This site has not been activated yet. If you are having problems activating your site, please contact <a href="mailto:%1$s">%1$s</a>.' ), str_replace( '@', ' AT ', get_site_option( 'admin_email', 'support@' . get_current_site()->domain ) ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( sprintf( __( 'This site has not been activated yet. If you are having problems activating your site, please contact <a href="mailto:%1$s">%1$s</a>.' ), str_replace( '@', ' AT ', get_network_option( 'admin_email', 'support@' . get_current_site()->domain ) ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $blog->archived == '1' || $blog->spam == '1' ) {
</span></span></pre></div>
<a id="trunksrcwpincludesmssettingsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/ms-settings.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-settings.php 2015-10-02 18:00:30 UTC (rev 34777)
+++ trunk/src/wp-includes/ms-settings.php 2015-10-02 19:07:23 UTC (rev 34778)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -222,7 +222,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $current_site->site_name ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $current_site->site_name = get_site_option( 'site_name' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $current_site->site_name = get_network_option( 'site_name' );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $current_site->site_name ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $current_site->site_name = ucfirst( $current_site->domain );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesoptionphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/option.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/option.php 2015-10-02 18:00:30 UTC (rev 34777)
+++ trunk/src/wp-includes/option.php 2015-10-02 19:07:23 UTC (rev 34778)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -88,7 +88,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_add( $option, $value, 'options' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else { // option does not exist, so we must cache its non-existence
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_array( $notoptions ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $notoptions = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $notoptions = array();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $notoptions[$option] = true;
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_set( 'notoptions', $notoptions, 'options' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1466,9 +1466,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $option_timeout = '_site_transient_timeout_' . $transient;
</span><span class="cx" style="display: block; padding: 0 10px"> $option = '_site_transient_' . $transient;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $result = delete_site_option( $option );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $result = delete_network_option( $option );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $result )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- delete_site_option( $option_timeout );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ delete_network_option( $option_timeout );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $result ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1529,16 +1529,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $transient_option = '_site_transient_' . $transient;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! in_array( $transient, $no_timeout ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $transient_timeout = '_site_transient_timeout_' . $transient;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $timeout = get_site_option( $transient_timeout );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $timeout = get_network_option( $transient_timeout );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( false !== $timeout && $timeout < time() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- delete_site_option( $transient_option );
- delete_site_option( $transient_timeout );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ delete_network_option( $transient_option );
+ delete_network_option( $transient_timeout );
</ins><span class="cx" style="display: block; padding: 0 10px"> $value = false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $value ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $value = get_site_option( $transient_option );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $value = get_network_option( $transient_option );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1593,14 +1593,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $transient_timeout = '_site_transient_timeout_' . $transient;
</span><span class="cx" style="display: block; padding: 0 10px"> $option = '_site_transient_' . $transient;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false === get_site_option( $option ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( false === get_network_option( $option ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $expiration )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_site_option( $transient_timeout, time() + $expiration );
- $result = add_site_option( $option, $value );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_network_option( $transient_timeout, time() + $expiration );
+ $result = add_network_option( $option, $value );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $expiration )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_site_option( $transient_timeout, time() + $expiration );
- $result = update_site_option( $option, $value );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_network_option( $transient_timeout, time() + $expiration );
+ $result = update_network_option( $option, $value );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $result ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1631,4 +1631,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'setted_site_transient', $transient, $value, $expiration );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return $result;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+}
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="trunksrcwpincludespluggablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/pluggable.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/pluggable.php 2015-10-02 18:00:30 UTC (rev 34777)
+++ trunk/src/wp-includes/pluggable.php 2015-10-02 19:07:23 UTC (rev 34778)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1961,19 +1961,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( defined( $const ) && constant( $const ) && empty( $duplicated_keys[ constant( $const ) ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $values[ $type ] = constant( $const );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! $values[ $type ] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $values[ $type ] = get_site_option( "{$scheme}_{$type}" );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $values[ $type ] = get_network_option( "{$scheme}_{$type}" );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $values[ $type ] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $values[ $type ] = wp_generate_password( 64, true, true );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_site_option( "{$scheme}_{$type}", $values[ $type ] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_network_option( "{$scheme}_{$type}", $values[ $type ] );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $values['key'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $values['key'] = get_site_option( 'secret_key' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $values['key'] = get_network_option( 'secret_key' );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $values['key'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $values['key'] = wp_generate_password( 64, true, true );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_site_option( 'secret_key', $values['key'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_network_option( 'secret_key', $values['key'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $values['salt'] = hash_hmac( 'md5', $scheme, $values['key'] );
</span></span></pre></div>
<a id="trunksrcwpincludesscriptloaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/script-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/script-loader.php 2015-10-02 18:00:30 UTC (rev 34777)
+++ trunk/src/wp-includes/script-loader.php 2015-10-02 19:07:23 UTC (rev 34778)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1161,13 +1161,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset($compress_scripts) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $compress_scripts = defined('COMPRESS_SCRIPTS') ? COMPRESS_SCRIPTS : true;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $compress_scripts && ( ! get_site_option('can_compress_scripts') || $compressed_output ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $compress_scripts && ( ! get_network_option( 'can_compress_scripts' ) || $compressed_output ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> $compress_scripts = false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset($compress_css) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $compress_css = defined('COMPRESS_CSS') ? COMPRESS_CSS : true;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $compress_css && ( ! get_site_option('can_compress_scripts') || $compressed_output ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $compress_css && ( ! get_network_option( 'can_compress_scripts' ) || $compressed_output ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> $compress_css = false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesuserfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/user-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/user-functions.php 2015-10-02 18:00:30 UTC (rev 34777)
+++ trunk/src/wp-includes/user-functions.php 2015-10-02 19:07:23 UTC (rev 34778)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1809,7 +1809,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_get_user_contact_methods( $user = null ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $methods = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( get_site_option( 'initial_db_version' ) < 23588 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( get_network_option( 'initial_db_version' ) < 23588 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $methods = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'aim' => __( 'AIM' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'yim' => __( 'Yahoo IM' ),
</span></span></pre></div>
<a id="trunksrcwpsignupphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-signup.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-signup.php 2015-10-02 18:00:30 UTC (rev 34777)
+++ trunk/src/wp-signup.php 2015-10-02 19:07:23 UTC (rev 34778)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,7 +7,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> require( dirname( __FILE__ ) . '/wp-blog-header.php' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( is_array( get_site_option( 'illegal_names' )) && isset( $_GET[ 'new' ] ) && in_array( $_GET[ 'new' ], get_site_option( 'illegal_names' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( is_array( get_network_option( 'illegal_names' ) ) && isset( $_GET[ 'new' ] ) && in_array( $_GET[ 'new' ], get_network_option( 'illegal_names' ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_redirect( network_home_url() );
</span><span class="cx" style="display: block; padding: 0 10px"> die();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -644,7 +644,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Main
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$active_signup = get_site_option( 'registration', 'none' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$active_signup = get_network_option( 'registration', 'none' );
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filter the type of site sign-up.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre>
</div>
</div>
</body>
</html>