Changeset 34778 for trunk/src/wp-admin/includes/ms.php

Timestamp:

10/02/2015 07:07:23 PM (11 years ago)

Author:

jeremyfelt

Message:

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 #28290.

File:

• trunk/src/wp-admin/includes/ms.php (modified) (10 diffs)

trunk/src/wp-admin/includes/ms.php

@@ -17 +17 @@
  */
 function check_upload_size( $file ) {
-        if ( get_site_option( 'upload_space_check_disabled' ) )
+        if ( get_network_option( 'upload_space_check_disabled' ) )
                 return $file;
 
@@ -31 +31 @@
         if ( $space_left < $file_size )
                 $file['error'] = sprintf( __( 'Not enough space to upload. %1$s KB needed.' ), number_format( ($file_size - $space_left) /1024 ) );
-        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 ) );
+        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 ) );
         if ( upload_is_user_over_quota( false ) ) {
                 $file['error'] = __( 'You have used your space quota. Please delete files before uploading.' );
@@ -99 +99 @@
 
         // If ms_files_rewriting is enabled and upload_path is empty, wp_upload_dir is not reliable.
-        if ( $drop && get_site_option( 'ms_files_rewriting' ) && empty( $upload_path ) ) {
+        if ( $drop && get_network_option( 'ms_files_rewriting' ) && empty( $upload_path ) ) {
                 $drop = false;
         }
@@ -307 +307 @@
         $content = str_replace( '###ADMIN_URL###', esc_url( admin_url( 'options.php?adminhash='.$hash ) ), $content );
         $content = str_replace( '###EMAIL###', $value, $content );
-        $content = str_replace( '###SITENAME###', get_site_option( 'site_name' ), $content );
+        $content = str_replace( '###SITENAME###', get_network_option( 'site_name' ), $content );
         $content = str_replace( '###SITEURL###', network_home_url(), $content );
 
@@ -386 +386 @@
                 $content = str_replace( '###ADMIN_URL###', esc_url( admin_url( 'profile.php?newuseremail='.$hash ) ), $content );
                 $content = str_replace( '###EMAIL###', $_POST['email'], $content);
-                $content = str_replace( '###SITENAME###', get_site_option( 'site_name' ), $content );
+                $content = str_replace( '###SITENAME###', get_network_option( 'site_name' ), $content );
                 $content = str_replace( '###SITEURL###', network_home_url(), $content );
 
@@ -414 +414 @@
  */
 function upload_is_user_over_quota( $echo = true ) {
-        if ( get_site_option( 'upload_space_check_disabled' ) )
+        if ( get_network_option( 'upload_space_check_disabled' ) )
                 return false;
 
@@ -747 +747 @@
         if ( !is_super_admin() )
                 return false;
-        if ( get_site_option( 'wpmu_upgrade_site' ) != $wp_db_version )
+        if ( get_network_option( 'wpmu_upgrade_site' ) != $wp_db_version )
                 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>";
 }
@@ -829 +829 @@
                 </td>
         </tr>
-        <?php if ( in_array( get_site_option( 'registration' ), array( 'all', 'blog' ) ) ) : ?>
+        <?php if ( in_array( get_network_option( 'registration' ), array( 'all', 'blog' ) ) ) : ?>
                 <tr>
                         <th scope="row" colspan="2" class="th-full">
@@ -871 +871 @@
 
         // Directly fetch site_admins instead of using get_super_admins()
-        $super_admins = get_site_option( 'site_admins', array( 'admin' ) );
+        $super_admins = get_network_option( 'site_admins', array( 'admin' ) );
 
         $user = get_userdata( $user_id );
         if ( $user && ! in_array( $user->user_login, $super_admins ) ) {
                 $super_admins[] = $user->user_login;
-                update_site_option( 'site_admins' , $super_admins );
+                update_network_option( 'site_admins' , $super_admins );
 
                 /**
@@ -918 +918 @@
 
         // Directly fetch site_admins instead of using get_super_admins()
-        $super_admins = get_site_option( 'site_admins', array( 'admin' ) );
+        $super_admins = get_network_option( 'site_admins', array( 'admin' ) );
 
         $user = get_userdata( $user_id );
-        if ( $user && 0 !== strcasecmp( $user->user_email, get_site_option( 'admin_email' ) ) ) {
+        if ( $user && 0 !== strcasecmp( $user->user_email, get_network_option( 'admin_email' ) ) ) {
                 if ( false !== ( $key = array_search( $user->user_login, $super_admins ) ) ) {
                         unset( $super_admins[$key] );
-                        update_site_option( 'site_admins', $super_admins );
+                        update_network_option( 'site_admins', $super_admins );
 
                         /**