Changeset 12672 for trunk/wp-admin/includes/ms.php

Timestamp:

01/08/2010 08:29:56 PM (15 years ago)

Author:

ryan

Message:

Use is_super_admin() instead of is_site_admin(). Props GIGALinux see #11644

File:

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

trunk/wp-admin/includes/ms.php

@@ -577 +577 @@
 
 function check_import_new_users( $permission ) {
-    if ( !is_site_admin() )
+    if ( !is_super_admin() )
         return false;
     return true;
@@ -649 +649 @@
 /* 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' );
@@ -715 +715 @@
         $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 ));
     }
@@ -723 +723 @@
 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);
@@ -813 +813 @@
  */
 function add_sitewide_activate_row( $file, $plugin_data, $context ) {
-    if ( !is_site_admin() )
+    if ( !is_super_admin() )
         return false;
 
@@ -860 +860 @@
     $all_plugins = get_plugins();
 
-    if ( !is_site_admin() )
+    if ( !is_super_admin() )
         return false;
 
@@ -964 +964 @@
 
     /* 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 ) )
@@ -1007 +1007 @@
 
         /* 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 );
@@ -1025 +1025 @@
                 deactivate_plugins( $plugin );
 
-                if ( is_site_admin() )
+                if ( is_super_admin() )
                     activate_sitewide_plugin( $plugin );
             }
@@ -1091 +1091 @@
 
     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 {
@@ -1107 +1107 @@
     $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." ) );
         }
@@ -1248 +1248 @@
 
 function show_post_thumbnail_warning() {
-    if ( false == is_site_admin() ) {
+    if ( false == is_super_admin() ) {
         return;
     }