Changeset 12764

Timestamp:

01/19/2010 06:11:33 PM (15 years ago)

Author:

ryan

Message:

Remove disable_some_pages(). Rely on cap checks. fixes #11770

Location:

trunk/wp-admin

Files:

• includes/ms.php (modified) (1 diff)
• user-new.php (modified) (1 diff)

trunk/wp-admin/includes/ms.php

@@ -1087 +1087 @@
 }
 
-function disable_some_pages() {
-    global $messages;
-
-    if ( strpos( $_SERVER['PHP_SELF'], 'user-new.php' ) && !get_site_option( 'add_new_users' ) ) {
-        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') );
-        }
-    }
-
-    $pages = array( 'theme-editor.php', 'plugin-editor.php' );
-    foreach( $pages as $page ) {
-        if ( strpos( $_SERVER['PHP_SELF'], $page ) ) {
-            wp_die( __('Page disabled by the administrator') );
-        }
-    }
-
-    $pages = array( 'theme-install.php', 'plugin-install.php' );
-    foreach( $pages as $page ) {
-        if ( strpos( $_SERVER['PHP_SELF'], $page ) && !is_super_admin() ) {
-            wp_die( __( "Sorry, you're not allowed here." ) );
-        }
-    }
-
-}
-add_action( 'admin_init', 'disable_some_pages' );
-
 function blogs_listing_post() {
     if ( !isset( $_POST[ 'action' ] ) ) {

trunk/wp-admin/user-new.php

@@ -12 +12 @@
 if ( !current_user_can('create_users') )
     wp_die(__('Cheatin’ uh?'));
+
+if ( is_multisite() && !get_site_option( 'add_new_users' ) )
+    wp_die( __('Page disabled by the administrator') );
 
 /** WordPress Registration API */