';
-screen_icon();
+screen_icon('tools');
echo '
' . __( 'Update Network' ) . '
';
$action = isset($_GET['action']) ? $_GET['action'] : 'show';
diff --git a/wp-admin/network/users.php b/wp-admin/network/users.php
index c925ae0842..74e505fff2 100644
--- a/wp-admin/network/users.php
+++ b/wp-admin/network/users.php
@@ -16,6 +16,8 @@ $wp_list_table->prepare_items();
$title = __( 'Users' );
$parent_file = 'users.php';
+add_screen_option( 'per_page', array('label' => _x( 'Users', 'users per page (screen options)' )) );
+
add_contextual_help($current_screen,
'
' . __('This table shows all users across the network and the sites to which they are assigned.') . '
' .
'
' . __('Hover over any user on the list to make the edit links appear. The Edit link on the left will take you to his or her Edit User profile page; the Edit link on the right by any site name goes to an Edit Site screen for that site.') . '
' .
diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php
index 03bd4d50a0..85d506a78b 100644
--- a/wp-admin/plugins.php
+++ b/wp-admin/plugins.php
@@ -290,6 +290,8 @@ $wp_list_table->prepare_items();
wp_enqueue_script('plugin-install');
add_thickbox();
+add_screen_option( 'per_page', array('label' => _x( 'Plugins', 'plugins per page (screen options)' ), 'default' => 999) );
+
add_contextual_help($current_screen,
'
' . __('Plugins extend and expand the functionality of WordPress. Once a plugin is installed, you may activate it or deactivate it here.') . '
' .
'
' . sprintf(__('You can find additional plugins for your site by using the Plugin Browser/Installer functionality or by browsing the WordPress Plugin Directory directly and installing new plugins manually. To manually install a plugin you generally just need to upload the plugin file into your /wp-content/plugins directory. Once a plugin has been installed, you can activate it here.'), 'plugin-install.php', 'http://wordpress.org/extend/plugins/') . '
' .
diff --git a/wp-admin/upload.php b/wp-admin/upload.php
index 4d864eb9a2..66b9f6f16b 100644
--- a/wp-admin/upload.php
+++ b/wp-admin/upload.php
@@ -134,6 +134,8 @@ wp_enqueue_script( 'wp-ajax-response' );
wp_enqueue_script( 'jquery-ui-draggable' );
wp_enqueue_script( 'media' );
+add_screen_option( 'per_page', array('label' => _x( 'Media items', 'items per page (screen options)' )) );
+
add_contextual_help( $current_screen,
'
' . __('All the files you’ve uploaded are listed in the Media Library, with the most recent uploads listed first. You can use the Screen Options tab to customize the display of this screen.') . '
' .
'
' . __('You can narrow the list by file type/status using the text link filters at the top of the screen. You also can refine the list by date using the dropdown menu above the media table.') . '
' .
diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php
index 7f0de03e0d..c108039805 100644
--- a/wp-admin/user-edit.php
+++ b/wp-admin/user-edit.php
@@ -31,7 +31,11 @@ if ( current_user_can('edit_users') && !IS_PROFILE_PAGE )
$submenu_file = 'users.php';
else
$submenu_file = 'profile.php';
-$parent_file = 'users.php';
+
+if ( current_user_can('edit_users') && !is_user_admin() )
+ $parent_file = 'users.php';
+else
+ $parent_file = 'profile.php';
// contextual help - choose Help on the top right of admin panel to preview this.
add_contextual_help($current_screen,
diff --git a/wp-admin/user/admin.php b/wp-admin/user/admin.php
new file mode 100644
index 0000000000..7d9b11583b
--- /dev/null
+++ b/wp-admin/user/admin.php
@@ -0,0 +1,10 @@
+
diff --git a/wp-admin/user/index-extra.php b/wp-admin/user/index-extra.php
new file mode 100644
index 0000000000..d778541bcb
--- /dev/null
+++ b/wp-admin/user/index-extra.php
@@ -0,0 +1,5 @@
+
\ No newline at end of file
diff --git a/wp-admin/user/profile.php b/wp-admin/user/profile.php
new file mode 100644
index 0000000000..98f5db702d
--- /dev/null
+++ b/wp-admin/user/profile.php
@@ -0,0 +1,5 @@
+check_permissions();
$title = __('Users');
$parent_file = 'users.php';
+add_screen_option( 'per_page', array('label' => _x( 'Users', 'users per page (screen options)' )) );
+
// contextual help - choose Help on the top right of admin panel to preview this.
add_contextual_help($current_screen,
'
' . __('This screen lists all the existing users for your site. Each user has one of five defined roles as set by the site admin: Site Administrator, Editor, Author, Contributor, or Subscriber. Users with roles other than Administrator will see fewer options when they are logged in, based on their role.') . '
' .
diff --git a/wp-includes/admin-bar.php b/wp-includes/admin-bar.php
index eb57d1713d..3a05c89294 100644
--- a/wp-includes/admin-bar.php
+++ b/wp-includes/admin-bar.php
@@ -110,14 +110,6 @@ function wp_admin_bar_my_blogs_menu() {
if ( !is_object( $wp_admin_bar ) )
return false;
- /* Remove the global dashboard */
- if ( is_multisite() ) {
- foreach ( (array) $wp_admin_bar->user->blogs as $key => $blog ) {
- if ( get_dashboard_blog() == $blog->domain )
- unset( $wp_admin_bar->user->blogs[$key] );
- }
- }
-
/* Add the 'My Dashboards' menu if the user has more than one blog. */
if ( count( $wp_admin_bar->user->blogs ) > 1 ) {
$wp_admin_bar->add_menu( array( 'id' => 'my-blogs', 'title' => __( 'My Blogs' ), 'href' => $wp_admin_bar->user->account_domain ) );
diff --git a/wp-includes/admin-bar/admin-bar-class.php b/wp-includes/admin-bar/admin-bar-class.php
index 91e30dd5fd..5b9774b228 100644
--- a/wp-includes/admin-bar/admin-bar-class.php
+++ b/wp-includes/admin-bar/admin-bar-class.php
@@ -15,7 +15,7 @@ class WP_Admin_Bar {
$this->user->blogs = get_ordered_blogs_of_user( $current_user->id );
if ( is_multisite() ) {
$this->user->active_blog = get_active_blog_for_user( $current_user->id );
- $this->user->domain = ( $this->user->active_blog == 'username only' ) ? get_dashboard_blog() : trailingslashit( get_home_url( $this->user->active_blog->blog_id ) );
+ $this->user->domain = empty( $this->user->active_blog ) ? user_admin_url() : trailingslashit( get_home_url( $this->user->active_blog->blog_id ) );
$this->user->account_domain = $this->user->domain;
} else {
$this->user->active_blog = $this->user->blogs[$blog_id];
diff --git a/wp-includes/capabilities.php b/wp-includes/capabilities.php
index 385899412f..959fae5440 100644
--- a/wp-includes/capabilities.php
+++ b/wp-includes/capabilities.php
@@ -737,6 +737,7 @@ class WP_User {
// Must have ALL requested caps
$capabilities = apply_filters( 'user_has_cap', $this->allcaps, $caps, $args );
+ $capabilities['exist'] = true; // Everyone is allowed to exist
foreach ( (array) $caps as $cap ) {
//echo "Checking cap $cap
";
if ( empty( $capabilities[$cap] ) || !$capabilities[$cap] )
diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index 0d458ef980..db5e2e8630 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -447,7 +447,7 @@ function wp_load_core_site_options( $site_id = null ) {
if ( empty($site_id) )
$site_id = $wpdb->siteid;
- $core_options = array('site_name', 'siteurl', 'active_sitewide_plugins', '_site_transient_timeout_theme_roots', '_site_transient_theme_roots', 'site_admins', 'dashboard_blog', 'can_compress_scripts', 'global_terms_enabled' );
+ $core_options = array('site_name', 'siteurl', 'active_sitewide_plugins', '_site_transient_timeout_theme_roots', '_site_transient_theme_roots', 'site_admins', 'can_compress_scripts', 'global_terms_enabled' );
$core_options_in = "'" . implode("', '", $core_options) . "'";
$options = $wpdb->get_results( $wpdb->prepare("SELECT meta_key, meta_value FROM $wpdb->sitemeta WHERE meta_key IN ($core_options_in) AND site_id = %d", $site_id) );
diff --git a/wp-includes/link-template.php b/wp-includes/link-template.php
index 44eb5a87c7..768fe63123 100644
--- a/wp-includes/link-template.php
+++ b/wp-includes/link-template.php
@@ -2129,6 +2129,25 @@ function network_admin_url( $path = '', $scheme = 'admin' ) {
return apply_filters('network_admin_url', $url, $path);
}
+/**
+ * Retrieve the url to the admin area for the current user.
+ *
+ * @package WordPress
+ * @since 3.0.0
+ *
+ * @param string $path Optional path relative to the admin url
+ * @param string $scheme The scheme to use. Default is 'admin', which obeys force_ssl_admin() and is_ssl(). 'http' or 'https' can be passed to force those schemes.
+ * @return string Admin url link with optional path appended
+*/
+function user_admin_url( $path = '', $scheme = 'admin' ) {
+ $url = network_site_url('wp-admin/user/', $scheme);
+
+ if ( !empty($path) && is_string($path) && strpos($path, '..') === false )
+ $url .= ltrim($path, '/');
+
+ return apply_filters('user_admin_url', $url, $path);
+}
+
/**
* Retrieve the url to the admin area for either the current blog or the network depending on context.
*
@@ -2142,6 +2161,8 @@ function network_admin_url( $path = '', $scheme = 'admin' ) {
function self_admin_url($path = '', $scheme = 'admin') {
if ( is_network_admin() )
return network_admin_url($path, $scheme);
+ elseif ( is_user_admin() )
+ return user_admin_url($path, $scheme);
else
return admin_url($path, $scheme);
}
diff --git a/wp-includes/load.php b/wp-includes/load.php
index c4fdc476c0..37fa7d0840 100644
--- a/wp-includes/load.php
+++ b/wp-includes/load.php
@@ -620,6 +620,22 @@ function is_network_admin() {
return false;
}
+/**
+ * Whether the current request is for a user admin screen /wp-admin/user/
+ *
+ * Does not inform on whether the user is an admin! Use capability checks to
+ * tell if the user should be accessing a section or not.
+ *
+ * @since 3.1.0
+ *
+ * @return bool True if inside WordPress user administration pages.
+ */
+function is_user_admin() {
+ if ( defined( 'WP_USER_ADMIN' ) )
+ return WP_USER_ADMIN;
+ return false;
+}
+
/**
* Whether Multisite support is enabled
*
diff --git a/wp-includes/ms-functions.php b/wp-includes/ms-functions.php
index 1468621d3a..b3ada31139 100644
--- a/wp-includes/ms-functions.php
+++ b/wp-includes/ms-functions.php
@@ -59,7 +59,6 @@ function get_admin_users_for_domain( $sitedomain = '', $path = '' ) {
*
* @since MU 1.0
* @uses get_blogs_of_user()
- * @uses get_dashboard_blog()
* @uses add_user_to_blog()
* @uses update_user_meta()
* @uses wp_cache_delete()
@@ -72,30 +71,29 @@ function get_admin_users_for_domain( $sitedomain = '', $path = '' ) {
function get_active_blog_for_user( $user_id ) {
global $wpdb;
$blogs = get_blogs_of_user( $user_id );
- if ( empty( $blogs ) ) {
- $details = get_dashboard_blog();
- add_user_to_blog( $details->blog_id, $user_id, 'subscriber' );
- update_user_meta( $user_id, 'primary_blog', $details->blog_id );
- wp_cache_delete( $user_id, 'users' );
- return $details;
- }
+ if ( empty( $blogs ) )
+ return null;
+
+ if ( !is_multisite() )
+ return $blogs[$wpdb->blogid];
$primary_blog = get_user_meta( $user_id, 'primary_blog', true );
- $details = get_dashboard_blog();
+ $first_blog = current($blogs);
if ( $primary_blog ) {
- if ( isset( $blogs[ $primary_blog ] ) == false ) {
- add_user_to_blog( $details->blog_id, $user_id, 'subscriber' );
- update_user_meta( $user_id, 'primary_blog', $details->blog_id );
- wp_cache_delete( $user_id, 'users' );
+ if ( ! isset( $blogs[ $primary_blog ] ) ) {
+ add_user_to_blog( $first_blog->blog_id, $user_id, 'subscriber' );
+ update_user_meta( $user_id, 'primary_blog', $first_blog->blog_id );
+ $primary = $first_blog;
} else {
- $details = get_blog_details( $primary_blog );
+ $primary = get_blog_details( $primary_blog );
}
} else {
- add_user_to_blog( $details->blog_id, $user_id, 'subscriber' ); // Add subscriber permission for dashboard blog
- update_user_meta( $user_id, 'primary_blog', $details->blog_id );
+ add_user_to_blog( $first_blog->blog_id, $user_id, 'subscriber' );
+ update_user_meta( $user_id, 'primary_blog', $first_blog->blog_id );
+ $primary = $first_blog;
}
- if ( ( is_object( $details ) == false ) || ( is_object( $details ) && $details->archived == 1 || $details->spam == 1 || $details->deleted == 1 ) ) {
+ if ( ( ! is_object( $primary ) ) || ( is_object( $primary ) && $primary->archived == 1 || $primary->spam == 1 || $primary->deleted == 1 ) ) {
$blogs = get_blogs_of_user( $user_id, true ); // if a user's primary blog is shut down, check their other blogs.
$ret = false;
if ( is_array( $blogs ) && count( $blogs ) > 0 ) {
@@ -105,30 +103,19 @@ function get_active_blog_for_user( $user_id ) {
$details = get_blog_details( $blog_id );
if ( is_object( $details ) && $details->archived == 0 && $details->spam == 0 && $details->deleted == 0 ) {
$ret = $blog;
- $changed = false;
- if ( get_user_meta( $user_id , 'primary_blog', true ) != $blog_id ) {
+ if ( get_user_meta( $user_id , 'primary_blog', true ) != $blog_id )
update_user_meta( $user_id, 'primary_blog', $blog_id );
- $changed = true;
- }
- if ( !get_user_meta($user_id , 'source_domain', true) ) {
+ if ( !get_user_meta($user_id , 'source_domain', true) )
update_user_meta( $user_id, 'source_domain', $blog->domain );
- $changed = true;
- }
- if ( $changed )
- wp_cache_delete( $user_id, 'users' );
break;
}
}
} else {
- // Should never get here
- $dashboard_blog = get_dashboard_blog();
- add_user_to_blog( $dashboard_blog->blog_id, $user_id, 'subscriber' ); // Add subscriber permission for dashboard blog
- update_user_meta( $user_id, 'primary_blog', $dashboard_blog->blog_id );
- return $dashboard_blog;
+ return null;
}
return $ret;
} else {
- return $details;
+ return $primary;
}
}
@@ -840,12 +827,6 @@ function wpmu_activate_signup($key) {
return new WP_Error( 'user_already_exists', __( 'That username is already activated.' ), $signup);
wpmu_welcome_user_notification($user_id, $password, $meta);
- $user_site = get_site_option( 'dashboard_blog', $current_site->blog_id );
-
- if ( $user_site == false )
- add_user_to_blog( '1', $user_id, get_site_option( 'default_user_role', 'subscriber' ) );
- else
- add_user_to_blog( $user_site, $user_id, get_site_option( 'default_user_role', 'subscriber' ) );
add_new_user_to_blog( $user_id, $user_email, $meta );
do_action('wpmu_activate_user', $user_id, $password, $meta);
@@ -926,7 +907,7 @@ function wpmu_create_blog($domain, $path, $title, $user_id, $meta = '', $site_id
add_option( 'WPLANG', get_site_option( 'WPLANG' ) );
update_option( 'blog_public', (int)$meta['public'] );
- if ( !is_super_admin() && get_user_meta( $user_id, 'primary_blog', true ) == get_site_option( 'dashboard_blog', 1 ) )
+ if ( !is_super_admin() && ! get_user_meta( $user_id, 'primary_blog', true ) )
update_user_meta( $user_id, 'primary_blog', $blog_id );
restore_current_blog();
@@ -1460,19 +1441,6 @@ function update_blog_public( $old_value, $value ) {
}
add_action('update_option_blog_public', 'update_blog_public', 10, 2);
-/* Redirect all hits to "dashboard" blog to wp-admin/ Dashboard. */
-function redirect_mu_dashboard() {
- global $current_site, $current_blog;
-
- $dashboard_blog = get_dashboard_blog();
- if ( $current_blog->blog_id == $dashboard_blog->blog_id && $dashboard_blog->blog_id != $current_site->blog_id ) {
- $protocol = ( is_ssl() ? 'https://' : 'http://' );
- wp_redirect( $protocol . $dashboard_blog->domain . trailingslashit( $dashboard_blog->path ) . 'wp-admin/' );
- die();
- }
-}
-add_action( 'template_redirect', 'redirect_mu_dashboard' );
-
function get_dashboard_blog() {
if ( $blog = get_site_option( 'dashboard_blog' ) )
return get_blog_details( $blog );
diff --git a/wp-includes/pluggable.php b/wp-includes/pluggable.php
index ba13617835..d444adc5b5 100644
--- a/wp-includes/pluggable.php
+++ b/wp-includes/pluggable.php
@@ -81,7 +81,7 @@ function get_currentuserinfo() {
return;
if ( ! $user = wp_validate_auth_cookie() ) {
- if ( is_admin() || empty($_COOKIE[LOGGED_IN_COOKIE]) || !$user = wp_validate_auth_cookie($_COOKIE[LOGGED_IN_COOKIE], 'logged_in') ) {
+ if ( is_blog_admin() || is_network_admin() || empty($_COOKIE[LOGGED_IN_COOKIE]) || !$user = wp_validate_auth_cookie($_COOKIE[LOGGED_IN_COOKIE], 'logged_in') ) {
wp_set_current_user(0);
return false;
}
@@ -775,7 +775,12 @@ function auth_redirect() {
}
}
- if ( $user_id = wp_validate_auth_cookie( '', apply_filters( 'auth_redirect_scheme', '' ) ) ) {
+ if ( is_user_admin() )
+ $scheme = 'logged_in';
+ else
+ $scheme = apply_filters( 'auth_redirect_scheme', '' );
+
+ if ( $user_id = wp_validate_auth_cookie( '', $scheme) ) {
do_action('auth_redirect', $user_id);
// If the user wants ssl but the session is not ssl, redirect.
diff --git a/wp-includes/vars.php b/wp-includes/vars.php
index 7a62c892ad..67d8d70d48 100644
--- a/wp-includes/vars.php
+++ b/wp-includes/vars.php
@@ -15,7 +15,12 @@
// On which page are we ?
if ( is_admin() ) {
// wp-admin pages are checked more carefully
- preg_match('#/wp-admin/?(.*?)$#i', $PHP_SELF, $self_matches);
+ if ( is_network_admin() )
+ preg_match('#/wp-admin/network/?(.*?)$#i', $PHP_SELF, $self_matches);
+ elseif ( is_user_admin() )
+ preg_match('#/wp-admin/user/?(.*?)$#i', $PHP_SELF, $self_matches);
+ else
+ preg_match('#/wp-admin/?(.*?)$#i', $PHP_SELF, $self_matches);
$pagenow = $self_matches[1];
$pagenow = trim($pagenow, '/');
$pagenow = preg_replace('#\?.*?$#', '', $pagenow);
diff --git a/wp-login.php b/wp-login.php
index 7d8efe8f00..08d95c87c3 100644
--- a/wp-login.php
+++ b/wp-login.php
@@ -572,8 +572,13 @@ default: