From 4c92a634a36fb74677c8f17e71b7e7cfd599828f Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Thu, 7 Jan 2010 15:52:22 +0000
Subject: [PATCH] User is_super_admin(). Props GIGALinux. see #11644

git-svn-id: http://svn.automattic.com/wordpress/trunk@12646 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/ms-admin.php        | 3 +--
 wp-admin/ms-edit.php         | 3 +--
 wp-admin/ms-sites.php        | 7 ++++---
 wp-admin/ms-upgrade-site.php | 5 ++---
 wp-admin/ms-users.php        | 3 +--
 5 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/wp-admin/ms-admin.php b/wp-admin/ms-admin.php
index 8c9eee14f..a783fb3f1 100644
--- a/wp-admin/ms-admin.php
+++ b/wp-admin/ms-admin.php
@@ -14,9 +14,8 @@ add_action( 'admin_head', 'index_css' );
 
 require_once('admin-header.php');
 
-if ( is_site_admin() == false ) {
+if ( !is_super_admin() )
 	wp_die( __('You do not have permission to access this page.') );
-}
 
 global $wpdb;
 $c_users = $wpdb->get_var("SELECT COUNT(id) FROM {$wpdb->users}");
diff --git a/wp-admin/ms-edit.php b/wp-admin/ms-edit.php
index fe48e8fe7..c26f6ca6a 100644
--- a/wp-admin/ms-edit.php
+++ b/wp-admin/ms-edit.php
@@ -4,9 +4,8 @@ require_once('admin.php');
 if ( !is_multisite() )
 	wp_die( __('Multisite support is not enabled.') );
 
-if( is_site_admin() == false ) {
+if ( !is_super_admin() )
 	wp_die( __('You do not have permission to access this page.') );
-}
 
 do_action('wpmuadminedit', '');
 
diff --git a/wp-admin/ms-sites.php b/wp-admin/ms-sites.php
index 3cc45b540..41fe86c83 100644
--- a/wp-admin/ms-sites.php
+++ b/wp-admin/ms-sites.php
@@ -10,9 +10,10 @@ $parent_file = 'ms-admin.php';
 wp_enqueue_script( 'admin-forms' );
 
 require_once('admin-header.php');
-if( is_site_admin() == false ) {
-    wp_die( __('You do not have permission to access this page.') );
-}
+
+if ( !is_super_admin() )
+	wp_die( __('You do not have permission to access this page.') );
+
 $id = intval( $_GET['id'] );
 $protocol = is_ssl() ? 'https://' : 'http://';
 
diff --git a/wp-admin/ms-upgrade-site.php b/wp-admin/ms-upgrade-site.php
index 8e16d2f62..af095af7c 100644
--- a/wp-admin/ms-upgrade-site.php
+++ b/wp-admin/ms-upgrade-site.php
@@ -10,9 +10,8 @@ $title = __('Upgrade Site');
 $parent_file = 'ms-admin.php';
 require_once('admin-header.php');
 
-if ( is_site_admin() == false ) {
-    wp_die( __('You do not have permission to access this page.') );
-}
+if ( !is_super_admin() )
+	wp_die( __('You do not have permission to access this page.') );
 
 echo '<div class="wrap">';
 echo '<h2>'.__('Upgrade Site').'</h2>';
diff --git a/wp-admin/ms-users.php b/wp-admin/ms-users.php
index 43d3296b8..acc9a9bbe 100644
--- a/wp-admin/ms-users.php
+++ b/wp-admin/ms-users.php
@@ -11,9 +11,8 @@ wp_enqueue_script( 'admin-forms' );
 
 require_once('admin-header.php');
 
-if( is_site_admin() == false ) {
+if ( !is_super_admin() )
 	wp_die( __('You do not have permission to access this page.') );
-}
 
 if ( $_GET['updated'] == 'true' ) {
 	?>