Ticket #11644: 11644.6.diff

wp-admin/includes/ms.php

@@ -576 +576 @@
 add_filter( 'whitelist_options', 'mu_options' );
 
 function check_import_new_users( $permission ) {
-        if ( !is_site_admin() )
+        if ( !is_super_admin() )
                 return false;
         return true;
 }
@@ -648 +648 @@
 
 /* Warn the admin if SECRET SALT information is missing from wp-config.php */
 function secret_salt_warning() {
-        if( !is_site_admin() )
+        if( !is_super_admin() )
                 return;
         $secret_keys = array( 'NONCE_KEY', 'AUTH_KEY', 'AUTH_SALT', 'LOGGED_IN_KEY', 'LOGGED_IN_SALT', 'SECURE_AUTH_KEY', 'SECURE_AUTH_SALT' );
         $out = '';
@@ -714 +714 @@
                 $link = clean_url( strip_tags( $item['link'] ) );
                 $msg .= "<p>" . $content . " <a href='$link'>" . __( 'Read More' ) . "</a> <a href='index.php?feed_dismiss=" . md5( $item[ 'title' ] ) . "'>" . __( "Dismiss" ) . "</a></p>";
                 echo "<div class='updated fade'>$msg</div>";
-        } elseif( is_site_admin() ) {
+        } elseif( is_super_admin() ) {
                 printf("<div id='update-nag'>" . __("Your feed at %s is empty.") . "</div>", wp_specialchars( $url ));
         }
 }
@@ -722 +722 @@
 
 function site_admin_notice() {
         global $current_user, $wp_db_version;
-        if( !is_site_admin() )
+        if( !is_super_admin() )
                 return false;
         printf("<div id='update-nag'>" . __("Hi %s! You're logged in as a site administrator.") . "</div>", $current_user->user_login);
         if ( get_site_option( 'wpmu_upgrade_site' ) != $wp_db_version ) {
@@ -809 +809 @@
  * Adds the "Activate plugin site wide" row for each plugin in the inactive plugins list.
  */
 function add_sitewide_activate_row( $file, $plugin_data, $context ) {
-        if ( !is_site_admin() )
+        if ( !is_super_admin() )
                 return false;
 
         if ( 'sitewide-active' == $context )
@@ -856 +856 @@
 function list_activate_sitewide_plugins() {
         $all_plugins = get_plugins();
 
-        if ( !is_site_admin() )
+        if ( !is_super_admin() )
                 return false;
 
         $active_sitewide_plugins = maybe_unserialize( get_site_option( 'active_sitewide_plugins') );
@@ -960 +960 @@
         }
 
         /* Now unset any sitewide only plugins if the user is not a site admin */
-        if ( !is_site_admin() ) {
+        if ( !is_super_admin() ) {
                 foreach ( $inactive_plugins as $plugin_name => $activated_time ) {
                         if ( is_wpmu_sitewide_plugin( $plugin_name ) )
                                 unset( $inactive_plugins[ $plugin_name ] );
@@ -1003 +1003 @@
                 deactivate_plugins( $_GET['plugin'], true );
 
                 /* Silently activate because the activate_* hook has already run. */
-                if ( is_site_admin() ) {
+                if ( is_super_admin() ) {
                         $_GET['sitewide'] = true;
                         activate_sitewide_plugin( $_GET['plugin'], true );
                 }
@@ -1020 +1020 @@
                         if ( is_wpmu_sitewide_plugin( $plugin ) ) {
                                 deactivate_plugins( $plugin );
 
-                                if ( is_site_admin() )
+                                if ( is_super_admin() )
                                         activate_sitewide_plugin( $plugin );
                         }
                 }
@@ -1086 +1086 @@
         global $messages;
 
         if ( strpos( $_SERVER['PHP_SELF'], 'user-new.php' ) && !get_site_option( 'add_new_users' ) ) {
-                if ( is_site_admin() ) {
+                if ( is_super_admin() ) {
                         $messages[] = '<div id="message" class="updated fade"><p>' . __( 'Warning! Only site administrators may see this page. Everyone else will see a <em>page disabled</em> message. Enable it again on <a href="ms-options.php#addnewusers">the options page</a>.' ) . '</p></div>';
                 } else {
                         wp_die( __('Page disabled by the administrator') );
@@ -1102 +1102 @@
 
         $pages = array( 'theme-install.php', 'plugin-install.php' );
         foreach( $pages as $page ) {
-                if ( strpos( $_SERVER['PHP_SELF'], $page ) && !is_site_admin() ) {
+                if ( strpos( $_SERVER['PHP_SELF'], $page ) && !is_super_admin() ) {
                         wp_die( __( "Sorry, you're not allowed here." ) );
                 }
         }
@@ -1243 +1243 @@
 add_action( 'wpmu_upgrade_site', 'stripslashes_from_options' );
 
 function show_post_thumbnail_warning() {
-        if ( false == is_site_admin() ) {
+        if ( false == is_super_admin() ) {
                 return;
         }
         $mu_media_buttons = get_site_option( 'mu_media_buttons', array() );

wp-includes/ms-functions.php

@@ -1025 +1025 @@
         if( in_array( $blogname, $illegal_names ) == true ) {
             $errors->add('blogname',  __("That name is not allowed"));
         }
-        if( strlen( $blogname ) < 4 && !is_site_admin() ) {
+        if( strlen( $blogname ) < 4 && !is_super_admin() ) {
             $errors->add('blogname',  __("Blog name must be at least 4 characters"));
         }
 
@@ -1305 +1305 @@
 
         update_option( 'blog_public', $meta['public'] );
 
-        if ( !is_site_admin() && get_usermeta( $user_id, 'primary_blog' ) == get_site_option( 'dashboard_blog', 1 ) )
+        if ( !is_super_admin() && get_usermeta( $user_id, 'primary_blog' ) == get_site_option( 'dashboard_blog', 1 ) )
                 update_usermeta( $user_id, 'primary_blog', $blog_id );
 
         restore_current_blog();
@@ -1522 +1522 @@
         $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id != %d AND meta_key = %s", $user_id, $table_prefix.'capabilities') );
 
         // Delete any caps that snuck into the previously active blog. (Hardcoded to blog 1 for now.) TODO: Get previous_blog_id.
-        if ( !is_site_admin( $user->user_login ) && $user_id != 1 )
+        if ( !is_super_admin( $user->user_login ) && $user_id != 1 )
                 $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $wpdb->base_prefix.'1_capabilities') );
 
         $wpdb->suppress_errors( false );
@@ -1927 +1927 @@
 }
 
 function wordpressmu_authenticate_siteadmin( $user, $password = '' ) {
-        if( is_site_admin( $user->user_login ) == false && ( $primary_blog = get_usermeta( $user->user_id, "primary_blog" ) ) ) {
+        if( is_super_admin( $user->user_login ) == false && ( $primary_blog = get_usermeta( $user->user_id, "primary_blog" ) ) ) {
                 $details = get_blog_details( $primary_blog );
                 if( is_object( $details ) && $details->spam == 1 ) {
                         return new WP_Error('blog_suspended', __('Blog Suspended.'));

wp-signup.php

@@ -374 +374 @@
 
 $active_signup = apply_filters( 'wpmu_active_signup', $active_signup ); // return "all", "none", "blog" or "user"
 
-if( is_site_admin() )
+if( is_super_admin() )
         echo '<div class="mu_alert">' . sprintf( __( "Greetings Site Administrator! You are currently allowing '%s' registrations. To change or disable registration go to your <a href='wp-admin/ms-options.php'>Options page</a>." ), $active_signup ) . '</div>';
 
 $newblogname = isset($_GET['new']) ? strtolower(preg_replace('/^-|-$|[^-a-zA-Z0-9]/', '', $_GET['new'])) : null;

xmlrpc.php

@@ -443 +443 @@
          */
         function wp_getUsersBlogs( $args ) {
                 // If this isn't on WPMU then just use blogger_getUsersBlogs
-                if( !function_exists( 'is_site_admin' ) ) {
+                if( !is_multisite() ) {
                         array_unshift( $args, 1 );
                         return $this->blogger_getUsersBlogs( $args );
                 }