<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[15746] trunk: First pass of user admin.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15746">15746</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-10-07 19:34:18 +0000 (Thu, 07 Oct 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>First pass of user admin. Network admin and screen cleanups. see <a href="http://trac.wordpress.org/ticket/14696">#14696</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminphp">trunk/wp-admin/admin.php</a></li>
<li><a href="#trunkwpadmineditcommentsphp">trunk/wp-admin/edit-comments.php</a></li>
<li><a href="#trunkwpadmineditformadvancedphp">trunk/wp-admin/edit-form-advanced.php</a></li>
<li><a href="#trunkwpadmineditlinkformphp">trunk/wp-admin/edit-link-form.php</a></li>
<li><a href="#trunkwpadminedittagsphp">trunk/wp-admin/edit-tags.php</a></li>
<li><a href="#trunkwpadmineditphp">trunk/wp-admin/edit.php</a></li>
<li><a href="#trunkwpadminincludesdashboardphp">trunk/wp-admin/includes/dashboard.php</a></li>
<li><a href="#trunkwpadminincludesdefaultlisttablesphp">trunk/wp-admin/includes/default-list-tables.php</a></li>
<li><a href="#trunkwpadminincludesmenuphp">trunk/wp-admin/includes/menu.php</a></li>
<li><a href="#trunkwpadminincludesmiscphp">trunk/wp-admin/includes/misc.php</a></li>
<li><a href="#trunkwpadminincludesmsphp">trunk/wp-admin/includes/ms.php</a></li>
<li><a href="#trunkwpadminincludestemplatephp">trunk/wp-admin/includes/template.php</a></li>
<li><a href="#trunkwpadminindexextraphp">trunk/wp-admin/index-extra.php</a></li>
<li><a href="#trunkwpadminindexphp">trunk/wp-admin/index.php</a></li>
<li><a href="#trunkwpadminjsdashboarddevjs">trunk/wp-admin/js/dashboard.dev.js</a></li>
<li><a href="#trunkwpadminjsdashboardjs">trunk/wp-admin/js/dashboard.js</a></li>
<li><a href="#trunkwpadminmenuphp">trunk/wp-admin/menu.php</a></li>
<li><a href="#trunkwpadminnetworkeditphp">trunk/wp-admin/network/edit.php</a></li>
<li><a href="#trunkwpadminnetworksettingsphp">trunk/wp-admin/network/settings.php</a></li>
<li><a href="#trunkwpadminnetworksitesphp">trunk/wp-admin/network/sites.php</a></li>
<li><a href="#trunkwpadminnetworkupgradephp">trunk/wp-admin/network/upgrade.php</a></li>
<li><a href="#trunkwpadminnetworkusersphp">trunk/wp-admin/network/users.php</a></li>
<li><a href="#trunkwpadminpluginsphp">trunk/wp-admin/plugins.php</a></li>
<li><a href="#trunkwpadminuploadphp">trunk/wp-admin/upload.php</a></li>
<li><a href="#trunkwpadminusereditphp">trunk/wp-admin/user-edit.php</a></li>
<li><a href="#trunkwpadminusersphp">trunk/wp-admin/users.php</a></li>
<li><a href="#trunkwpincludesadminbaradminbarclassphp">trunk/wp-includes/admin-bar/admin-bar-class.php</a></li>
<li><a href="#trunkwpincludesadminbarphp">trunk/wp-includes/admin-bar.php</a></li>
<li><a href="#trunkwpincludescapabilitiesphp">trunk/wp-includes/capabilities.php</a></li>
<li><a href="#trunkwpincludesfunctionsphp">trunk/wp-includes/functions.php</a></li>
<li><a href="#trunkwpincludeslinktemplatephp">trunk/wp-includes/link-template.php</a></li>
<li><a href="#trunkwpincludesloadphp">trunk/wp-includes/load.php</a></li>
<li><a href="#trunkwpincludesmsfunctionsphp">trunk/wp-includes/ms-functions.php</a></li>
<li><a href="#trunkwpincludespluggablephp">trunk/wp-includes/pluggable.php</a></li>
<li><a href="#trunkwpincludesvarsphp">trunk/wp-includes/vars.php</a></li>
<li><a href="#trunkwploginphp">trunk/wp-login.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/wp-admin/user/</li>
<li><a href="#trunkwpadminuseradminphp">trunk/wp-admin/user/admin.php</a></li>
<li><a href="#trunkwpadminuserindexextraphp">trunk/wp-admin/user/index-extra.php</a></li>
<li><a href="#trunkwpadminuserindexphp">trunk/wp-admin/user/index.php</a></li>
<li><a href="#trunkwpadminusermenuphp">trunk/wp-admin/user/menu.php</a></li>
<li><a href="#trunkwpadminuserprofilephp">trunk/wp-admin/user/profile.php</a></li>
<li><a href="#trunkwpadminuserusereditphp">trunk/wp-admin/user/user-edit.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminadminphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin.php (15745 => 15746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin.php 2010-10-07 18:14:53 UTC (rev 15745)
+++ trunk/wp-admin/admin.php 2010-10-07 19:34:18 UTC (rev 15746)
</span><span class="lines">@@ -11,11 +11,16 @@
</span><span class="cx"> *
</span><span class="cx"> * @since unknown
</span><span class="cx"> */
</span><del>-if ( !defined('WP_ADMIN') )
</del><ins>+if ( ! defined('WP_ADMIN') )
</ins><span class="cx"> define('WP_ADMIN', TRUE);
</span><span class="cx">
</span><del>-if ( !defined('WP_NETWORK_ADMIN') ) {
</del><ins>+if ( ! defined('WP_NETWORK_ADMIN') )
</ins><span class="cx"> define('WP_NETWORK_ADMIN', FALSE);
</span><ins>+
+if ( ! defined('WP_USER_ADMIN') )
+ define('WP_USER_ADMIN', FALSE);
+
+if ( ! WP_NETWORK_ADMIN && ! WP_USER_ADMIN ) {
</ins><span class="cx"> define('WP_BLOG_ADMIN', TRUE);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -97,6 +102,8 @@
</span><span class="cx">
</span><span class="cx"> if ( WP_NETWORK_ADMIN )
</span><span class="cx"> require(ABSPATH . 'wp-admin/network/menu.php');
</span><ins>+elseif ( WP_USER_ADMIN )
+ require(ABSPATH . 'wp-admin/user/menu.php');
</ins><span class="cx"> else
</span><span class="cx"> require(ABSPATH . 'wp-admin/menu.php');
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadmineditcommentsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-comments.php (15745 => 15746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-comments.php 2010-10-07 18:14:53 UTC (rev 15745)
+++ trunk/wp-admin/edit-comments.php 2010-10-07 19:34:18 UTC (rev 15746)
</span><span class="lines">@@ -105,6 +105,8 @@
</span><span class="cx"> else
</span><span class="cx"> $title = __('Comments');
</span><span class="cx">
</span><ins>+add_screen_option( 'per_page', array('label' => _x( 'Comments', 'comments per page (screen options)' )) );
+
</ins><span class="cx"> add_contextual_help( $current_screen, '<p>' . __('You can manage comments made on your site similar to the way you manage Posts and other content. This screen is customizable in the same ways as other management screens, and you can act on comments using the on-hover action links or the Bulk Actions.') . '</p>' .
</span><span class="cx"> '<p>' . __('A yellow row means the comment is waiting for you to moderate it.') . '</p>' .
</span><span class="cx"> '<p>' . __('In the Author column, in addition to the author&#8217;s name, email address, and blog URL, the commenter&#8217;s IP address is shown. Clicking on this link will show you all the comments made from this IP address.') . '</p>' .
</span></span></pre></div>
<a id="trunkwpadmineditformadvancedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-form-advanced.php (15745 => 15746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-form-advanced.php 2010-10-07 18:14:53 UTC (rev 15745)
+++ trunk/wp-admin/edit-form-advanced.php 2010-10-07 19:34:18 UTC (rev 15746)
</span><span class="lines">@@ -163,6 +163,8 @@
</span><span class="cx"> do_action('do_meta_boxes', $post_type, 'advanced', $post);
</span><span class="cx"> do_action('do_meta_boxes', $post_type, 'side', $post);
</span><span class="cx">
</span><ins>+add_screen_option('layout_columns', array('max' => 2) );
+
</ins><span class="cx"> if ( 'post' == $post_type ) {
</span><span class="cx"> add_contextual_help($current_screen,
</span><span class="cx"> '<p>' . __('The title field and the big Post Editing Area are fixed in place, but you can reposition all the other boxes that allow you to add metadata to your post using drag and drop, and can minimize or expand them by clicking the title bar of the box. You can also hide any of the boxes by using the Screen Options tab, where you can also choose a 1- or 2-column layout for this screen.') . '</p>' .
</span></span></pre></div>
<a id="trunkwpadmineditlinkformphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-link-form.php (15745 => 15746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-link-form.php 2010-10-07 18:14:53 UTC (rev 15745)
+++ trunk/wp-admin/edit-link-form.php 2010-10-07 19:34:18 UTC (rev 15746)
</span><span class="lines">@@ -37,6 +37,8 @@
</span><span class="cx"> do_action('do_meta_boxes', 'link', 'advanced', $link);
</span><span class="cx"> do_action('do_meta_boxes', 'link', 'side', $link);
</span><span class="cx">
</span><ins>+add_screen_option('layout_columns', array('max' => 2) );
+
</ins><span class="cx"> add_contextual_help($current_screen,
</span><span class="cx"> '<p>' . __( 'You can add or edit links on this screen by entering information in each of the boxes. Only the link&#8217;s web address and name (the text you want to display on your site as the link) are required fields.' ) . '</p>' .
</span><span class="cx"> '<p>' . __( 'The boxes for link name, web address, and description have fixed positions, while the others may be repositioned using drag and drop. You can also hide boxes you don&#8217;t use in the Screen Options tab, or minimize boxes by clicking on the title bar of the box.' ) . '</p>' .
</span></span></pre></div>
<a id="trunkwpadminedittagsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-tags.php (15745 => 15746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-tags.php 2010-10-07 18:14:53 UTC (rev 15745)
+++ trunk/wp-admin/edit-tags.php 2010-10-07 19:34:18 UTC (rev 15746)
</span><span class="lines">@@ -22,6 +22,8 @@
</span><span class="cx"> $submenu_file = "edit-tags.php?taxonomy=$taxonomy";
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+add_screen_option( 'per_page', array('label' => $title, 'default' => 20, 'option' => 'edit_' . $tax->name . '_per_page') );
+
</ins><span class="cx"> switch ( $wp_list_table->current_action() ) {
</span><span class="cx">
</span><span class="cx"> case 'add-tag':
</span></span></pre></div>
<a id="trunkwpadmineditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit.php (15745 => 15746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit.php 2010-10-07 18:14:53 UTC (rev 15745)
+++ trunk/wp-admin/edit.php 2010-10-07 19:34:18 UTC (rev 15746)
</span><span class="lines">@@ -163,6 +163,8 @@
</span><span class="cx"> );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+add_screen_option( 'per_page', array('label' => $title, 'default' => 20) );
+
</ins><span class="cx"> require_once('./admin-header.php');
</span><span class="cx"> ?>
</span><span class="cx"> <div class="wrap">
</span></span></pre></div>
<a id="trunkwpadminincludesdashboardphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/dashboard.php (15745 => 15746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/dashboard.php 2010-10-07 18:14:53 UTC (rev 15745)
+++ trunk/wp-admin/includes/dashboard.php 2010-10-07 19:34:18 UTC (rev 15746)
</span><span class="lines">@@ -16,6 +16,7 @@
</span><span class="cx"> function wp_dashboard_setup() {
</span><span class="cx"> global $wp_registered_widgets, $wp_registered_widget_controls, $wp_dashboard_control_callbacks;
</span><span class="cx"> $wp_dashboard_control_callbacks = array();
</span><ins>+ $screen = get_current_screen();
</ins><span class="cx">
</span><span class="cx"> $update = false;
</span><span class="cx"> $widget_options = get_option( 'dashboard_widget_options' );
</span><span class="lines">@@ -25,42 +26,47 @@
</span><span class="cx"> /* Register Widgets and Controls */
</span><span class="cx">
</span><span class="cx"> // Right Now
</span><del>- wp_add_dashboard_widget( 'dashboard_right_now', __( 'Right Now' ), 'wp_dashboard_right_now' );
</del><ins>+ if ( is_blog_admin() && current_user_can('edit_posts') )
+ wp_add_dashboard_widget( 'dashboard_right_now', __( 'Right Now' ), 'wp_dashboard_right_now' );
</ins><span class="cx">
</span><span class="cx"> // Recent Comments Widget
</span><del>- if ( !isset( $widget_options['dashboard_recent_comments'] ) || !isset( $widget_options['dashboard_recent_comments']['items'] ) ) {
- $update = true;
- $widget_options['dashboard_recent_comments'] = array(
- 'items' => 5,
- );
</del><ins>+ if ( is_blog_admin() && current_user_can('moderate_comments') ) {
+ if ( !isset( $widget_options['dashboard_recent_comments'] ) || !isset( $widget_options['dashboard_recent_comments']['items'] ) ) {
+ $update = true;
+ $widget_options['dashboard_recent_comments'] = array(
+ 'items' => 5,
+ );
+ }
+ $recent_comments_title = __( 'Recent Comments' );
+ wp_add_dashboard_widget( 'dashboard_recent_comments', $recent_comments_title, 'wp_dashboard_recent_comments', 'wp_dashboard_recent_comments_control' );
</ins><span class="cx"> }
</span><del>- $recent_comments_title = __( 'Recent Comments' );
- wp_add_dashboard_widget( 'dashboard_recent_comments', $recent_comments_title, 'wp_dashboard_recent_comments', 'wp_dashboard_recent_comments_control' );
</del><span class="cx">
</span><span class="cx"> // Incoming Links Widget
</span><del>- if ( !isset( $widget_options['dashboard_incoming_links'] ) || !isset( $widget_options['dashboard_incoming_links']['home'] ) || $widget_options['dashboard_incoming_links']['home'] != get_option('home') ) {
- $update = true;
- $num_items = isset($widget_options['dashboard_incoming_links']['items']) ? $widget_options['dashboard_incoming_links']['items'] : 10;
- $widget_options['dashboard_incoming_links'] = array(
- 'home' => get_option('home'),
- 'link' => apply_filters( 'dashboard_incoming_links_link', 'http://blogsearch.google.com/blogsearch?scoring=d&partner=wordpress&q=link:' . trailingslashit( get_option('home') ) ),
- 'url' => isset($widget_options['dashboard_incoming_links']['url']) ? apply_filters( 'dashboard_incoming_links_feed', $widget_options['dashboard_incoming_links']['url'] ) : apply_filters( 'dashboard_incoming_links_feed', 'http://blogsearch.google.com/blogsearch_feeds?scoring=d&ie=utf-8&num=' . $num_items . '&output=rss&partner=wordpress&q=link:' . trailingslashit( get_option('home') ) ),
- 'items' => $num_items,
- 'show_date' => isset($widget_options['dashboard_incoming_links']['show_date']) ? $widget_options['dashboard_incoming_links']['show_date'] : false
- );
</del><ins>+ if ( is_blog_admin() && current_user_can('publish_posts') ) {
+ if ( !isset( $widget_options['dashboard_incoming_links'] ) || !isset( $widget_options['dashboard_incoming_links']['home'] ) || $widget_options['dashboard_incoming_links']['home'] != get_option('home') ) {
+ $update = true;
+ $num_items = isset($widget_options['dashboard_incoming_links']['items']) ? $widget_options['dashboard_incoming_links']['items'] : 10;
+ $widget_options['dashboard_incoming_links'] = array(
+ 'home' => get_option('home'),
+ 'link' => apply_filters( 'dashboard_incoming_links_link', 'http://blogsearch.google.com/blogsearch?scoring=d&partner=wordpress&q=link:' . trailingslashit( get_option('home') ) ),
+ 'url' => isset($widget_options['dashboard_incoming_links']['url']) ? apply_filters( 'dashboard_incoming_links_feed', $widget_options['dashboard_incoming_links']['url'] ) : apply_filters( 'dashboard_incoming_links_feed', 'http://blogsearch.google.com/blogsearch_feeds?scoring=d&ie=utf-8&num=' . $num_items . '&output=rss&partner=wordpress&q=link:' . trailingslashit( get_option('home') ) ),
+ 'items' => $num_items,
+ 'show_date' => isset($widget_options['dashboard_incoming_links']['show_date']) ? $widget_options['dashboard_incoming_links']['show_date'] : false
+ );
+ }
+ wp_add_dashboard_widget( 'dashboard_incoming_links', __( 'Incoming Links' ), 'wp_dashboard_incoming_links', 'wp_dashboard_incoming_links_control' );
</ins><span class="cx"> }
</span><del>- wp_add_dashboard_widget( 'dashboard_incoming_links', __( 'Incoming Links' ), 'wp_dashboard_incoming_links', 'wp_dashboard_incoming_links_control' );
</del><span class="cx">
</span><span class="cx"> // WP Plugins Widget
</span><del>- if ( current_user_can( 'install_plugins' ) )
</del><ins>+ if ( is_blog_admin() && current_user_can( 'install_plugins' ) )
</ins><span class="cx"> wp_add_dashboard_widget( 'dashboard_plugins', __( 'Plugins' ), 'wp_dashboard_plugins' );
</span><span class="cx">
</span><span class="cx"> // QuickPress Widget
</span><del>- if ( current_user_can('edit_posts') )
</del><ins>+ if ( is_blog_admin() && current_user_can('edit_posts') )
</ins><span class="cx"> wp_add_dashboard_widget( 'dashboard_quick_press', __( 'QuickPress' ), 'wp_dashboard_quick_press' );
</span><span class="cx">
</span><span class="cx"> // Recent Drafts
</span><del>- if ( current_user_can('edit_posts') )
</del><ins>+ if ( is_blog_admin() && current_user_can('edit_posts') )
</ins><span class="cx"> wp_add_dashboard_widget( 'dashboard_recent_drafts', __('Recent Drafts'), 'wp_dashboard_recent_drafts' );
</span><span class="cx">
</span><span class="cx"> // Primary feed (Dev Blog) Widget
</span><span class="lines">@@ -115,28 +121,32 @@
</span><span class="cx"> if ( $update )
</span><span class="cx"> update_option( 'dashboard_widget_options', $widget_options );
</span><span class="cx">
</span><del>- do_action('do_meta_boxes', 'dashboard', 'normal', '');
- do_action('do_meta_boxes', 'dashboard', 'side', '');
</del><ins>+ do_action('do_meta_boxes', $screen->id, 'normal', '');
+ do_action('do_meta_boxes', $screen->id, 'side', '');
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function wp_add_dashboard_widget( $widget_id, $widget_name, $callback, $control_callback = null ) {
</span><ins>+ $screen = get_current_screen();
</ins><span class="cx"> global $wp_dashboard_control_callbacks;
</span><span class="cx"> if ( $control_callback && current_user_can( 'edit_dashboard' ) && is_callable( $control_callback ) ) {
</span><span class="cx"> $wp_dashboard_control_callbacks[$widget_id] = $control_callback;
</span><span class="cx"> if ( isset( $_GET['edit'] ) && $widget_id == $_GET['edit'] ) {
</span><span class="cx"> list($url) = explode( '#', add_query_arg( 'edit', false ), 2 );
</span><span class="cx"> $widget_name .= ' <span class="postbox-title-action"><a href="' . esc_url( $url ) . '">' . __( 'Cancel' ) . '</a></span>';
</span><del>- add_meta_box( $widget_id, $widget_name, '_wp_dashboard_control_callback', 'dashboard', 'normal', 'core' );
</del><ins>+ add_meta_box( $widget_id, $widget_name, '_wp_dashboard_control_callback', $screen->id, 'normal', 'core' );
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> list($url) = explode( '#', add_query_arg( 'edit', $widget_id ), 2 );
</span><span class="cx"> $widget_name .= ' <span class="postbox-title-action"><a href="' . esc_url( "$url#$widget_id" ) . '" class="edit-box open-box">' . __( 'Configure' ) . '</a></span>';
</span><span class="cx"> }
</span><del>- $side_widgets = array('dashboard_quick_press', 'dashboard_recent_drafts', 'dashboard_primary', 'dashboard_secondary');
</del><ins>+ if ( is_user_admin() )
+ $side_widgets = array();
+ else
+ $side_widgets = array('dashboard_quick_press', 'dashboard_recent_drafts', 'dashboard_primary', 'dashboard_secondary');
</ins><span class="cx"> $location = 'normal';
</span><span class="cx"> if ( in_array($widget_id, $side_widgets) )
</span><span class="cx"> $location = 'side';
</span><del>- add_meta_box( $widget_id, $widget_name , $callback, 'dashboard', $location, 'core' );
</del><ins>+ add_meta_box( $widget_id, $widget_name , $callback, $screen->id, $location, 'core' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function _wp_dashboard_control_callback( $dashboard, $meta_box ) {
</span><span class="lines">@@ -155,6 +165,8 @@
</span><span class="cx"> function wp_dashboard() {
</span><span class="cx"> global $screen_layout_columns;
</span><span class="cx">
</span><ins>+ $screen = get_current_screen();
+
</ins><span class="cx"> $hide2 = $hide3 = $hide4 = '';
</span><span class="cx"> switch ( $screen_layout_columns ) {
</span><span class="cx"> case 4:
</span><span class="lines">@@ -176,16 +188,16 @@
</span><span class="cx"> <div id="dashboard-widgets" class="metabox-holder">
</span><span class="cx"> <?php
</span><span class="cx"> echo "\t<div class='postbox-container' style='$width'>\n";
</span><del>- do_meta_boxes( 'dashboard', 'normal', '' );
</del><ins>+ do_meta_boxes( $screen->id, 'normal', '' );
</ins><span class="cx">
</span><span class="cx"> echo "\t</div><div class='postbox-container' style='{$hide2}$width'>\n";
</span><del>- do_meta_boxes( 'dashboard', 'side', '' );
</del><ins>+ do_meta_boxes( $screen->id, 'side', '' );
</ins><span class="cx">
</span><span class="cx"> echo "\t</div><div class='postbox-container' style='{$hide3}$width'>\n";
</span><del>- do_meta_boxes( 'dashboard', 'column3', '' );
</del><ins>+ do_meta_boxes( $screen->id, 'column3', '' );
</ins><span class="cx">
</span><span class="cx"> echo "\t</div><div class='postbox-container' style='{$hide4}$width'>\n";
</span><del>- do_meta_boxes( 'dashboard', 'column4', '' );
</del><ins>+ do_meta_boxes( $screen->id, 'column4', '' );
</ins><span class="cx"> ?>
</span><span class="cx"> </div></div>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesdefaultlisttablesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/default-list-tables.php (15745 => 15746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/default-list-tables.php 2010-10-07 18:14:53 UTC (rev 15745)
+++ trunk/wp-admin/includes/default-list-tables.php 2010-10-07 19:34:18 UTC (rev 15746)
</span><span class="lines">@@ -2719,7 +2719,7 @@
</span><span class="cx">
</span><span class="cx"> function WP_Sites_Table() {
</span><span class="cx"> parent::WP_List_Table( array(
</span><del>- 'screen' => 'ms-sites',
</del><ins>+ 'screen' => 'sites-network',
</ins><span class="cx"> 'plural' => 'sites',
</span><span class="cx"> ) );
</span><span class="cx"> }
</span><span class="lines">@@ -2734,7 +2734,7 @@
</span><span class="cx">
</span><span class="cx"> $mode = ( empty( $_REQUEST['mode'] ) ) ? 'list' : $_REQUEST['mode'];
</span><span class="cx">
</span><del>- $per_page = $this->get_items_per_page( 'ms_sites_per_page' );
</del><ins>+ $per_page = $this->get_items_per_page( 'sites_network_per_page' );
</ins><span class="cx">
</span><span class="cx"> $pagenum = $this->get_pagenum();
</span><span class="cx">
</span><span class="lines">@@ -3007,7 +3007,7 @@
</span><span class="cx">
</span><span class="cx"> function WP_MS_Users_Table() {
</span><span class="cx"> parent::WP_List_Table( array(
</span><del>- 'screen' => 'ms-users',
</del><ins>+ 'screen' => 'users-network',
</ins><span class="cx"> ) );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3024,7 +3024,7 @@
</span><span class="cx">
</span><span class="cx"> $usersearch = isset( $_REQUEST['s'] ) ? $_REQUEST['s'] : '';
</span><span class="cx">
</span><del>- $users_per_page = $this->get_items_per_page( 'ms_users_per_page' );
</del><ins>+ $users_per_page = $this->get_items_per_page( 'users_network_per_page' );
</ins><span class="cx">
</span><span class="cx"> $paged = $this->get_pagenum();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/menu.php (15745 => 15746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/menu.php 2010-10-07 18:14:53 UTC (rev 15745)
+++ trunk/wp-admin/includes/menu.php 2010-10-07 19:34:18 UTC (rev 15746)
</span><span class="lines">@@ -9,6 +9,8 @@
</span><span class="cx">
</span><span class="cx"> if ( is_network_admin() )
</span><span class="cx"> do_action('_network_admin_menu');
</span><ins>+elseif ( is_user_admin() )
+ do_action('_user_admin_menu');
</ins><span class="cx"> else
</span><span class="cx"> do_action('_admin_menu');
</span><span class="cx">
</span><span class="lines">@@ -89,6 +91,8 @@
</span><span class="cx">
</span><span class="cx"> if ( is_network_admin() )
</span><span class="cx"> do_action('network_admin_menu', '');
</span><ins>+elseif ( is_user_admin() )
+ do_action('user_admin_menu', '');
</ins><span class="cx"> else
</span><span class="cx"> do_action('admin_menu', '');
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesmiscphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/misc.php (15745 => 15746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/misc.php 2010-10-07 18:14:53 UTC (rev 15745)
+++ trunk/wp-admin/includes/misc.php 2010-10-07 19:34:18 UTC (rev 15746)
</span><span class="lines">@@ -343,9 +343,9 @@
</span><span class="cx">
</span><span class="cx"> switch ( $map_option ) {
</span><span class="cx"> case 'edit_per_page':
</span><del>- case 'ms_sites_per_page':
</del><ins>+ case 'sites_network_per_page':
</ins><span class="cx"> case 'users_per_page':
</span><del>- case 'ms_users_per_page':
</del><ins>+ case 'users_network_per_page':
</ins><span class="cx"> case 'edit_comments_per_page':
</span><span class="cx"> case 'upload_per_page':
</span><span class="cx"> case 'edit_tags_per_page':
</span></span></pre></div>
<a id="trunkwpadminincludesmsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/ms.php (15745 => 15746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ms.php 2010-10-07 18:14:53 UTC (rev 15745)
+++ trunk/wp-admin/includes/ms.php 2010-10-07 19:34:18 UTC (rev 15746)
</span><span class="lines">@@ -502,29 +502,14 @@
</span><span class="cx"> $c ++;
</span><span class="cx">
</span><span class="cx"> $blog = get_active_blog_for_user( get_current_user_id() );
</span><del>- $dashboard_blog = get_dashboard_blog();
</del><ins>+
</ins><span class="cx"> if ( is_object( $blog ) ) {
</span><span class="cx"> wp_redirect( get_admin_url( $blog->blog_id, '?c=' . $c ) ); // redirect and count to 5, "just in case"
</span><span class="cx"> exit;
</span><ins>+ } else {
+ wp_redirect( user_admin_url( '?c=' . $c ) ); // redirect and count to 5, "just in case"
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- /*
- If the user is a member of only 1 blog and the user's primary_blog isn't set to that blog,
- then update the primary_blog record to match the user's blog
- */
- $blogs = get_blogs_of_user( get_current_user_id() );
-
- if ( !empty( $blogs ) ) {
- foreach( $blogs as $blogid => $blog ) {
- if ( $blogid != $dashboard_blog->blog_id && get_user_meta( get_current_user_id() , 'primary_blog', true ) == $dashboard_blog->blog_id ) {
- update_user_meta( get_current_user_id(), 'primary_blog', $blogid );
- continue;
- }
- }
- $blog = get_blog_details( get_user_meta( get_current_user_id(), 'primary_blog', true ) );
- wp_redirect( get_admin_url( $blog->blog_id, '?c=' . $c ) );
- exit;
- }
</del><span class="cx"> wp_die( __( 'You do not have sufficient permissions to access this page.' ) );
</span><span class="cx"> }
</span><span class="cx"> add_action( 'admin_page_access_denied', 'redirect_user_to_blog', 99 );
</span></span></pre></div>
<a id="trunkwpadminincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/template.php (15745 => 15746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/template.php 2010-10-07 18:14:53 UTC (rev 15745)
+++ trunk/wp-admin/includes/template.php 2010-10-07 19:34:18 UTC (rev 15746)
</span><span class="lines">@@ -1390,6 +1390,9 @@
</span><span class="cx"> if ( is_string($screen) )
</span><span class="cx"> $screen = convert_to_screen($screen);
</span><span class="cx">
</span><ins>+ if ( $screen->is_user )
+ return;
+
</ins><span class="cx"> if ( isset($screen->post_type) ) {
</span><span class="cx"> $post_type_object = get_post_type_object($screen->post_type);
</span><span class="cx"> if ( 'add' != $screen->action )
</span><span class="lines">@@ -1635,7 +1638,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function screen_meta($screen) {
</span><del>- global $wp_meta_boxes, $_wp_contextual_help, $wp_list_table;
</del><ins>+ global $wp_meta_boxes, $_wp_contextual_help, $wp_list_table, $wp_current_screen_options;
</ins><span class="cx">
</span><span class="cx"> if ( is_string($screen) )
</span><span class="cx"> $screen = convert_to_screen($screen);
</span><span class="lines">@@ -1669,9 +1672,12 @@
</span><span class="cx"> $show_screen = true;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>- if( ! empty( $settings ) )
</del><ins>+ if ( ! empty( $settings ) )
</ins><span class="cx"> $show_screen = true;
</span><span class="cx">
</span><ins>+ if ( !empty($wp_current_screen_options) )
+ $show_screen = true;
+
</ins><span class="cx"> ?>
</span><span class="cx"> <div id="screen-meta">
</span><span class="cx"> <?php if ( $show_screen ) : ?>
</span><span class="lines">@@ -1796,29 +1802,30 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function screen_layout($screen) {
</span><del>- global $screen_layout_columns;
</del><ins>+ global $screen_layout_columns, $wp_current_screen_options;
</ins><span class="cx">
</span><span class="cx"> if ( is_string($screen) )
</span><span class="cx"> $screen = convert_to_screen($screen);
</span><span class="cx">
</span><del>- $columns = array('dashboard' => 4, 'link' => 2);
</del><ins>+ // Back compat for plugins using the filter instead of add_screen_option()
+ $columns = apply_filters('screen_layout_columns', array(), $screen->id, $screen);
+ if ( !empty($columns) && isset($columns[$screen->id]) )
+ add_screen_option('layout_columns', array('max' => $columns[$screen->id]) );
</ins><span class="cx">
</span><del>- // Add custom post types
- foreach ( get_post_types( array('show_ui' => true) ) as $post_type )
- $columns[$post_type] = 2;
-
- $columns = apply_filters('screen_layout_columns', $columns, $screen->id, $screen);
-
- if ( !isset($columns[$screen->id]) ) {
</del><ins>+ if ( !isset($wp_current_screen_options['layout_columns']) ) {
</ins><span class="cx"> $screen_layout_columns = 0;
</span><span class="cx"> return '';
</span><del>- }
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> $screen_layout_columns = get_user_option("screen_layout_$screen->id");
</span><del>- $num = $columns[$screen->id];
</del><ins>+ $num = $wp_current_screen_options['layout_columns']['max'];
</ins><span class="cx">
</span><del>- if ( ! $screen_layout_columns )
</del><ins>+ if ( ! $screen_layout_columns ) {
+ if ( isset($wp_current_screen_options['layout_columns']['default']) )
+ $screen_layout_columns = $wp_current_screen_options['layout_columns']['default'];
+ else
</ins><span class="cx"> $screen_layout_columns = 2;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> $i = 1;
</span><span class="cx"> $return = '<h5>' . __('Screen Layout') . "</h5>\n<div class='columns-prefs'>" . __('Number of Columns:') . "\n";
</span><span class="lines">@@ -1830,55 +1837,45 @@
</span><span class="cx"> return $return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Register and configure an admin screen option
+ *
+ * @since 3.1.0
+ *
+ * @param string $option An option name.
+ * @param mixed $args Option dependent arguments
+ * @return void
+ */
+function add_screen_option( $option, $args = array() ) {
+ global $wp_current_screen_options;
+
+ if ( !isset($wp_current_screen_options) )
+ $wp_current_screen_options = array();
+
+ $wp_current_screen_options[$option] = $args;
+}
+
</ins><span class="cx"> function screen_options($screen) {
</span><ins>+ global $wp_current_screen_options;
+
</ins><span class="cx"> if ( is_string($screen) )
</span><span class="cx"> $screen = convert_to_screen($screen);
</span><span class="cx">
</span><del>- switch ( $screen->base ) {
- case 'edit':
- case 'edit-pages':
- $post_type = 'post';
- if ( isset($_GET['post_type']) && in_array( $_GET['post_type'], get_post_types( array( 'show_ui' => true ) ) ) )
- $post_type = $_GET['post_type'];
- $post_type_object = get_post_type_object($post_type);
- $per_page_label = $post_type_object->labels->name;
- break;
- case 'ms-sites':
- $per_page_label = _x( 'Sites', 'sites per page (screen options)' );
- break;
- case 'users':
- case 'ms-users':
- $per_page_label = _x( 'Users', 'users per page (screen options)' );
- break;
- case 'edit-comments':
- $per_page_label = _x( 'Comments', 'comments per page (screen options)' );
- break;
- case 'upload':
- $per_page_label = _x( 'Media items', 'items per page (screen options)' );
- break;
- case 'edit-tags':
- global $tax;
- $per_page_label = $tax->labels->name;
- break;
- case 'plugins':
- $per_page_label = _x( 'Plugins', 'plugins per page (screen options)' );
- break;
- default:
- return '';
- }
</del><ins>+ if ( !isset($wp_current_screen_options['per_page']) )
+ return '';
</ins><span class="cx">
</span><del>- $option = str_replace( '-', '_', "{$screen->id}_per_page" );
- if ( 'edit_tags_per_page' == $option ) {
- if ( 'category' == $tax->name )
- $option = 'categories_per_page';
- elseif ( 'post_tag' != $tax->name )
- $option = 'edit_' . $tax->name . '_per_page';
</del><ins>+ $per_page_label = $wp_current_screen_options['per_page']['label'];
+
+ if ( empty($wp_current_screen_options['per_page']['option']) ) {
+ $option = str_replace( '-', '_', "{$screen->id}_per_page" );
+ } else {
+ $option = $wp_current_screen_options['per_page']['option'];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $per_page = (int) get_user_option( $option );
</span><span class="cx"> if ( empty( $per_page ) || $per_page < 1 ) {
</span><del>- if ( 'plugins' == $screen->id )
- $per_page = 999;
</del><ins>+ if ( isset($wp_current_screen_options['per_page']['default']) )
+ $per_page = $wp_current_screen_options['per_page']['default'];
</ins><span class="cx"> else
</span><span class="cx"> $per_page = 20;
</span><span class="cx"> }
</span><span class="lines">@@ -1998,6 +1995,22 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Get the current screen object
+ *
+ * @since 3.1.0
+ *
+ * @return object Current screen object
+ */
+function get_current_screen() {
+ global $current_screen;
+
+ if ( !isset($current_screen) )
+ return null;
+
+ return $current_screen;
+}
+
+/**
</ins><span class="cx"> * Set the current screen object
</span><span class="cx"> *
</span><span class="cx"> * @since 3.0.0
</span><span class="lines">@@ -2060,6 +2073,15 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $current_screen->is_network = is_network_admin() ? true : false;
</span><ins>+ $current_screen->is_user = is_user_admin() ? true : false;
+
+ if ( $current_screen->is_network ) {
+ $current_screen->base .= '-network';
+ $current_screen->id .= '-network';
+ } elseif ( $current_screen->is_user ) {
+ $current_screen->base .= '-user';
+ $current_screen->id .= '-user';
+ }
</ins><span class="cx">
</span><span class="cx"> $current_screen = apply_filters('current_screen', $current_screen);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminindexextraphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/index-extra.php (15745 => 15746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/index-extra.php 2010-10-07 18:14:53 UTC (rev 15745)
+++ trunk/wp-admin/index-extra.php 2010-10-07 19:34:18 UTC (rev 15746)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx"> require_once( './admin.php' );
</span><span class="cx">
</span><span class="cx"> /** Load WordPress Administration Dashboard API */
</span><del>-require( './includes/dashboard.php' );
</del><ins>+require(ABSPATH . 'wp-admin/includes/dashboard.php' );
</ins><span class="cx">
</span><span class="cx"> @header( 'Content-Type: ' . get_option( 'html_type' ) . '; charset=' . get_option( 'blog_charset' ) );
</span><span class="cx"> send_nosniff_header();
</span></span></pre></div>
<a id="trunkwpadminindexphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/index.php (15745 => 15746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/index.php 2010-10-07 18:14:53 UTC (rev 15745)
+++ trunk/wp-admin/index.php 2010-10-07 19:34:18 UTC (rev 15746)
</span><span class="lines">@@ -24,6 +24,11 @@
</span><span class="cx"> $title = __('Dashboard');
</span><span class="cx"> $parent_file = 'index.php';
</span><span class="cx">
</span><ins>+if ( is_user_admin() )
+ add_screen_option('layout_columns', array('max' => 4, 'default' => 1) );
+else
+ add_screen_option('layout_columns', array('max' => 4, 'default' => 2) );
+
</ins><span class="cx"> add_contextual_help($current_screen,
</span><span class="cx">
</span><span class="cx"> '<p>' . __('Welcome to your WordPress Dashboard! You will find helpful tips in the Help tab of each screen to assist you as you get to know the application.') . '</p>' .
</span><span class="lines">@@ -42,7 +47,7 @@
</span><span class="cx"> '<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
</span><span class="cx"> );
</span><span class="cx">
</span><del>-require_once('./admin-header.php');
</del><ins>+include (ABSPATH . 'wp-admin/admin-header.php');
</ins><span class="cx">
</span><span class="cx"> $today = current_time('mysql', 1);
</span><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpadminjsdashboarddevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/dashboard.dev.js (15745 => 15746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/dashboard.dev.js 2010-10-07 18:14:53 UTC (rev 15745)
+++ trunk/wp-admin/js/dashboard.dev.js 2010-10-07 19:34:18 UTC (rev 15746)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> };
</span><span class="cx"> ajaxPopulateWidgets();
</span><span class="cx">
</span><del>- postboxes.add_postbox_toggles('dashboard', { pbshow: ajaxPopulateWidgets } );
</del><ins>+ postboxes.add_postbox_toggles(pagenow, { pbshow: ajaxPopulateWidgets } );
</ins><span class="cx">
</span><span class="cx"> /* QuickPress */
</span><span class="cx"> quickPressLoad = function() {
</span></span></pre></div>
<a id="trunkwpadminjsdashboardjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/dashboard.js (15745 => 15746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/dashboard.js 2010-10-07 18:14:53 UTC (rev 15745)
+++ trunk/wp-admin/js/dashboard.js 2010-10-07 19:34:18 UTC (rev 15746)
</span><span class="lines">@@ -1 +1 @@
</span><del>-var ajaxWidgets,ajaxPopulateWidgets,quickPressLoad;jQuery(document).ready(function(a){ajaxWidgets=["dashboard_incoming_links","dashboard_primary","dashboard_secondary","dashboard_plugins","dashboard_quick_press"];ajaxPopulateWidgets=function(b){show=function(g,c){var f,d=a("#"+g+" div.inside:visible").find(".widget-loading");if(d.length){f=d.parent();setTimeout(function(){f.load("index-extra.php?jax="+g,"",function(){f.hide().slideDown("normal",function(){a(this).css("display","");if("dashboard_plugins"==g&&a.isFunction(tb_init)){tb_init("#dashboard_plugins a.thickbox")}if("dashboard_quick_press"==g&&a.isFunction(tb_init)){tb_init("#dashboard_quick_press a.thickbox");quickPressLoad()}})})},c*500)}};if(b){b=b.toString();if(a.inArray(b,ajaxWidgets)!=-1){show(b,0)}}else{a.each(ajaxWidgets,function(c){show(this,c)})}};ajaxPopulateWidgets();postboxes.add_postbox_toggles("dashboard",{pbshow:ajaxPopulateWidgets});quickPressLoad=function(){var b=a("#quickpost-action"),c;c=a("#quick-press").submit(function(){a("#dashboard_quick_press #publishing-action img.waiting").css("visibility","visible");a('#quick-press .submit input[type="submit"], #quick-press .submit input[type="reset"]').attr("disabled","disabled");if("post"==b.val()){b.val("post-quickpress-publish")}a("#dashboard_quick_press div.inside").load(c.attr("action"),c.serializeArray(),function(){a("#dashboard_quick_press #publishing-action img.waiting").css("visibility","hidden");a('#quick-press .submit input[type="submit"], #quick-press .submit input[type="reset"]').attr("disabled","");a("#dashboard_quick_press ul").next("p").remove();a("#dashboard_quick_press ul").find("li").each(function(){a("#dashboard_recent_drafts ul").prepend(this)}).end().remove();tb_init("a.thickbox");quickPressLoad()});return false});a("#publish").click(function(){b.val("post-quickpress-publish")})}});
</del><span class="cx">\ No newline at end of file
</span><ins>+var ajaxWidgets,ajaxPopulateWidgets,quickPressLoad;jQuery(document).ready(function(a){ajaxWidgets=["dashboard_incoming_links","dashboard_primary","dashboard_secondary","dashboard_plugins","dashboard_quick_press"];ajaxPopulateWidgets=function(b){show=function(g,c){var f,d=a("#"+g+" div.inside:visible").find(".widget-loading");if(d.length){f=d.parent();setTimeout(function(){f.load("index-extra.php?jax="+g,"",function(){f.hide().slideDown("normal",function(){a(this).css("display","");if("dashboard_plugins"==g&&a.isFunction(tb_init)){tb_init("#dashboard_plugins a.thickbox")}if("dashboard_quick_press"==g&&a.isFunction(tb_init)){tb_init("#dashboard_quick_press a.thickbox");quickPressLoad()}})})},c*500)}};if(b){b=b.toString();if(a.inArray(b,ajaxWidgets)!=-1){show(b,0)}}else{a.each(ajaxWidgets,function(c){show(this,c)})}};ajaxPopulateWidgets();postboxes.add_postbox_toggles(pagenow,{pbshow:ajaxPopulateWidgets});quickPressLoad=function(){var b=a("#quickpost-action"),c;c=a("#quick-press").submit(function(){a("#dashboard_quick_press #publishing-action img.waiting").css("visibility","visible");a('#quick-press .submit input[type="submit"], #quick-press .submit input[type="reset"]').attr("disabled","disabled");if("post"==b.val()){b.val("post-quickpress-publish")}a("#dashboard_quick_press div.inside").load(c.attr("action"),c.serializeArray(),function(){a("#dashboard_quick_press #publishing-action img.waiting").css("visibility","hidden");a('#quick-press .submit input[type="submit"], #quick-press .submit input[type="reset"]').attr("disabled","");a("#dashboard_quick_press ul").next("p").remove();a("#dashboard_quick_press ul").find("li").each(function(){a("#dashboard_recent_drafts ul").prepend(this)}).end().remove();tb_init("a.thickbox");quickPressLoad()});return false});a("#publish").click(function(){b.val("post-quickpress-publish")})}});
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpadminmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/menu.php (15745 => 15746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/menu.php 2010-10-07 18:14:53 UTC (rev 15745)
+++ trunk/wp-admin/menu.php 2010-10-07 19:34:18 UTC (rev 15746)
</span><span class="lines">@@ -232,6 +232,6 @@
</span><span class="cx"> 'themes' => 'appearance',
</span><span class="cx"> );
</span><span class="cx">
</span><del>-require(ABSPATH . 'wp-admin/includes/menu.php');
</del><ins>+require_once(ABSPATH . 'wp-admin/includes/menu.php');
</ins><span class="cx">
</span><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpadminnetworkeditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/edit.php (15745 => 15746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/edit.php 2010-10-07 18:14:53 UTC (rev 15745)
+++ trunk/wp-admin/network/edit.php 2010-10-07 19:34:18 UTC (rev 15746)
</span><span class="lines">@@ -52,8 +52,8 @@
</span><span class="cx"> $user_dropdown = "<select name='blog[$val][{$key}]'>";
</span><span class="cx"> $user_list = '';
</span><span class="cx"> foreach ( $blog_users as $user ) {
</span><del>- if ( $user->user_id != $val && !in_array( $user->user_id, $allusers ) )
- $user_list .= "<option value='{$user->user_id}'>{$user->user_login}</option>";
</del><ins>+ if ( $user->user_id != $val && !in_array( $user->id, $allusers ) )
+ $user_list .= "<option value='{$user->id}'>{$user->user_login}</option>";
</ins><span class="cx"> }
</span><span class="cx"> if ( '' == $user_list )
</span><span class="cx"> $user_list = $admin_out;
</span><span class="lines">@@ -137,53 +137,8 @@
</span><span class="cx"> } else {
</span><span class="cx"> update_site_option( 'banned_email_domains', '' );
</span><span class="cx"> }
</span><del>- update_site_option( 'default_user_role', $_POST['default_user_role'] );
- if ( trim( $_POST['dashboard_blog_orig'] ) == '' )
- $_POST['dashboard_blog_orig'] = $current_site->blog_id;
- if ( trim( $_POST['dashboard_blog'] ) == '' ) {
- $_POST['dashboard_blog'] = $current_site->blog_id;
- $dashboard_blog_id = $current_site->blog_id;
- } elseif ( ! preg_match( '/(--|\.)/', $_POST['dashboard_blog'] ) && preg_match( '|^([a-zA-Z0-9-\.])+$|', $_POST['dashboard_blog'] ) ) {
- $dashboard_blog = $_POST['dashboard_blog'];
- $blog_details = get_blog_details( $dashboard_blog );
- if ( false === $blog_details ) {
- if ( is_numeric( $dashboard_blog ) )
- wp_die( __( 'A dashboard site referenced by ID must already exist' ) );
- if ( is_subdomain_install() ) {
- $domain = $dashboard_blog . '.' . $current_site->domain;
- $path = $current_site->path;
- } else {
- $domain = $current_site->domain;
- $path = trailingslashit( $current_site->path . $dashboard_blog );
- }
- $wpdb->hide_errors();
- $dashboard_blog_id = wpmu_create_blog( $domain, $path, __( 'My Dashboard' ), $current_user->id , array( 'public' => 0 ), $current_site->id );
- $wpdb->show_errors();
- } else {
- $dashboard_blog_id = $blog_details->blog_id;
- }
- }
- if ( is_wp_error( $dashboard_blog_id ) )
- wp_die( __( 'Problem creating dashboard site: ' ) . $dashboard_blog_id->get_error_message() );
- if ( $_POST['dashboard_blog_orig'] != $_POST['dashboard_blog'] ) {
- $users = get_users_of_blog( get_site_option( 'dashboard_blog' ) );
- $move_users = array();
- foreach ( (array)$users as $user ) {
- $user_meta_value = unserialize( $user->meta_value );
- if ( is_array( $user_meta_value ) && array_pop( $var_by_ref = array_keys( $user_meta_value ) ) == 'subscriber' )
- $move_users[] = $user->user_id;
- }
- if ( false == empty( $move_users ) ) {
- foreach ( (array)$move_users as $user_id ) {
- remove_user_from_blog($user_id, get_site_option( 'dashboard_blog' ) );
- add_user_to_blog( $dashboard_blog_id, $user_id, get_site_option( 'default_user_role', 'subscriber' ) );
- update_user_meta( $user_id, 'primary_blog', $dashboard_blog_id );
- }
- }
- }
- update_site_option( 'dashboard_blog', $dashboard_blog_id );
</del><span class="cx">
</span><del>- $options = array( 'registrationnotification', 'registration', 'add_new_users', 'menu_items', 'mu_media_buttons', 'upload_space_check_disabled', 'blog_upload_space', 'upload_filetypes', 'site_name', 'first_post', 'first_page', 'first_comment', 'first_comment_url', 'first_comment_author', 'welcome_email', 'welcome_user_email', 'fileupload_maxk', 'admin_notice_feed', 'global_terms_enabled' );
</del><ins>+ $options = array( 'registrationnotification', 'registration', 'add_new_users', 'menu_items', 'mu_media_buttons', 'upload_space_check_disabled', 'blog_upload_space', 'upload_filetypes', 'site_name', 'first_post', 'first_page', 'first_comment', 'first_comment_url', 'first_comment_author', 'welcome_email', 'welcome_user_email', 'fileupload_maxk', 'global_terms_enabled' );
</ins><span class="cx"> $checked_options = array( 'mu_media_buttons' => array(), 'menu_items' => array(), 'registrationnotification' => 'no', 'upload_space_check_disabled' => 1, 'add_new_users' => 0 );
</span><span class="cx"> foreach ( $checked_options as $option_name => $option_unchecked_value ) {
</span><span class="cx"> if ( ! isset( $_POST[$option_name] ) )
</span><span class="lines">@@ -255,8 +210,7 @@
</span><span class="cx"> $id = wpmu_create_blog( $newdomain, $path, $title, $user_id , array( 'public' => 1 ), $current_site->id );
</span><span class="cx"> $wpdb->show_errors();
</span><span class="cx"> if ( !is_wp_error( $id ) ) {
</span><del>- $dashboard_blog = get_dashboard_blog();
- if ( !is_super_admin( $user_id ) && get_user_option( 'primary_blog', $user_id ) == $dashboard_blog->blog_id )
</del><ins>+ if ( !is_super_admin( $user_id ) && !get_user_option( 'primary_blog', $user_id ) )
</ins><span class="cx"> update_user_option( $user_id, 'primary_blog', $id, true );
</span><span class="cx"> $content_mail = sprintf( __( "New site created by %1s\n\nAddress: http://%2s\nName: %3s"), $current_user->user_login , $newdomain . $path, stripslashes( $title ) );
</span><span class="cx"> wp_mail( get_site_option('admin_email'), sprintf( __( '[%s] New Site Created' ), $current_site->site_name ), $content_mail, 'From: "Site Admin" <' . get_site_option( 'admin_email' ) . '>' );
</span><span class="lines">@@ -687,11 +641,6 @@
</span><span class="cx"> else
</span><span class="cx"> wp_new_user_notification( $user_id, $password );
</span><span class="cx">
</span><del>- if ( get_site_option( 'dashboard_blog' ) == false )
- add_user_to_blog( $current_site->blog_id, $user_id, get_site_option( 'default_user_role', 'subscriber' ) );
- else
- add_user_to_blog( get_site_option( 'dashboard_blog' ), $user_id, get_site_option( 'default_user_role', 'subscriber' ) );
-
</del><span class="cx"> wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'add' ), wp_get_referer() ) );
</span><span class="cx"> exit();
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkwpadminnetworksettingsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/settings.php (15745 => 15746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/settings.php 2010-10-07 18:14:53 UTC (rev 15745)
+++ trunk/wp-admin/network/settings.php 2010-10-07 19:34:18 UTC (rev 15746)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> <div class="wrap">
</span><del>- <?php screen_icon(); ?>
</del><ins>+ <?php screen_icon('options-general'); ?>
</ins><span class="cx"> <h2><?php _e( 'Network Options' ) ?></h2>
</span><span class="cx"> <form method="post" action="edit.php?action=siteoptions">
</span><span class="cx"> <?php wp_nonce_field( 'siteoptions' ); ?>
</span><span class="lines">@@ -67,44 +67,6 @@
</span><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx"> </table>
</span><del>- <h3><?php _e( 'Dashboard Settings' ); ?></h3>
- <table class="form-table">
- <tr valign="top">
- <th scope="row"><label for="dashboard_blog"><?php _e( 'Dashboard Site' ) ?></label></th>
- <td>
- <?php
- if ( $dashboard_blog = get_site_option( 'dashboard_blog' ) ) {
- $details = get_blog_details( $dashboard_blog );
- $blogname = untrailingslashit( sanitize_user( str_replace( '.', '', str_replace( $current_site->domain . $current_site->path, '', $details->domain . $details->path ) ) ) );
- } else {
- $blogname = '';
- }?>
- <input name="dashboard_blog_orig" type="hidden" id="dashboard_blog_orig" value="<?php echo esc_attr( $blogname ); ?>" />
- <input name="dashboard_blog" type="text" id="dashboard_blog" value="<?php echo esc_attr( $blogname ); ?>" class="regular-text" />
- <br />
- <?php _e( 'Site path (&#8220;dashboard&#8221;, &#8220;control&#8221;, &#8220;manager&#8221;, etc.) or blog ID.<br />New users are added to this site as the user role defined below if they don&#8217;t have a site. Leave blank for the main site. Users with the Subscriber role on the old site will be moved to the new site if changed. The new site will be created if it does not exist.' ); ?>
- </td>
- </tr>
- <tr valign="top">
- <th scope="row"><label for="default_user_role"><?php _e( 'Dashboard User Default Role' ) ?></label></th>
- <td>
- <select name="default_user_role" id="default_user_role"><?php
- wp_dropdown_roles( get_site_option( 'default_user_role', 'subscriber' ) );
- ?>
- </select>
- <br />
- <?php _e( 'The default role for new users on the Dashboard site. &#8220;Subscriber&#8221; or &#8220;Contributor&#8221; roles are recommended.' ); ?>
- </td>
- </tr>
- <tr valign="top">
- <th scope="row"><label for="admin_notice_feed"><?php _e( 'Admin Notice Feed' ) ?></label></th>
- <td><input name="admin_notice_feed" class="large-text" type="text" id="admin_notice_feed" value="<?php echo esc_attr( get_site_option( 'admin_notice_feed' ) ) ?>" size="80" /><br />
- <?php _e( 'Display the latest post from this RSS or Atom feed on all site dashboards. Leave blank to disable.' ); ?><br />
-
- <?php if ( get_site_option( 'admin_notice_feed' ) != get_home_url( $current_site->id, 'feed/' ) )
- echo __( 'A good one to use would be the feed from your main site: ' ) . esc_url( get_home_url( $current_site->id, 'feed/' ) ) ?></td>
- </tr>
- </table>
</del><span class="cx"> <h3><?php _e( 'Registration Settings' ); ?></h3>
</span><span class="cx"> <table class="form-table">
</span><span class="cx"> <tr valign="top">
</span></span></pre></div>
<a id="trunkwpadminnetworksitesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/sites.php (15745 => 15746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/sites.php 2010-10-07 18:14:53 UTC (rev 15745)
+++ trunk/wp-admin/network/sites.php 2010-10-07 19:34:18 UTC (rev 15746)
</span><span class="lines">@@ -18,6 +18,8 @@
</span><span class="cx"> $title = __( 'Sites' );
</span><span class="cx"> $parent_file = 'sites.php';
</span><span class="cx">
</span><ins>+add_screen_option( 'per_page', array('label' => _x( 'Sites', 'sites per page (screen options)' )) );
+
</ins><span class="cx"> if ( isset( $_REQUEST['action'] ) && 'editblog' == $_REQUEST['action'] ) {
</span><span class="cx"> add_contextual_help($current_screen,
</span><span class="cx"> '<p>' . __('This extensive list of options has five modules: Site Info, Site Options, allowing Site Themes for this given site, changing user roles and passwords for that site, adding a new user, and Miscellaneous Site Actions (upload size limits).') . '</p>' .
</span><span class="lines">@@ -109,7 +111,7 @@
</span><span class="cx"> require_once( '../admin-header.php' );
</span><span class="cx"> ?>
</span><span class="cx"> <div class="wrap">
</span><del>- <?php screen_icon(); ?>
</del><ins>+ <?php screen_icon('index'); ?>
</ins><span class="cx"> <h2><?php _e( 'Edit Site' ); ?> - <a href="<?php echo esc_url( get_home_url( $id ) ); ?>"><?php echo esc_url( get_home_url( $id ) ); ?></a></h2>
</span><span class="cx"> <?php echo $msg; ?>
</span><span class="cx"> <form method="post" action="edit.php?action=updateblog">
</span><span class="lines">@@ -347,7 +349,7 @@
</span><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> <div class="wrap">
</span><del>- <?php screen_icon(); ?>
</del><ins>+ <?php screen_icon('index'); ?>
</ins><span class="cx"> <h2><?php _e('Sites') ?>
</span><span class="cx"> <?php echo $msg; ?>
</span><span class="cx"> <a href="#form-add-site" class="button add-new-h2"><?php echo esc_html_x( 'Add New', 'sites' ); ?></a>
</span></span></pre></div>
<a id="trunkwpadminnetworkupgradephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/upgrade.php (15745 => 15746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/upgrade.php 2010-10-07 18:14:53 UTC (rev 15745)
+++ trunk/wp-admin/network/upgrade.php 2010-10-07 19:34:18 UTC (rev 15746)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> wp_die( __( 'You do not have permission to access this page.' ) );
</span><span class="cx">
</span><span class="cx"> echo '<div class="wrap">';
</span><del>-screen_icon();
</del><ins>+screen_icon('tools');
</ins><span class="cx"> echo '<h2>' . __( 'Update Network' ) . '</h2>';
</span><span class="cx">
</span><span class="cx"> $action = isset($_GET['action']) ? $_GET['action'] : 'show';
</span></span></pre></div>
<a id="trunkwpadminnetworkusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/users.php (15745 => 15746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/users.php 2010-10-07 18:14:53 UTC (rev 15745)
+++ trunk/wp-admin/network/users.php 2010-10-07 19:34:18 UTC (rev 15746)
</span><span class="lines">@@ -16,6 +16,8 @@
</span><span class="cx"> $title = __( 'Users' );
</span><span class="cx"> $parent_file = 'users.php';
</span><span class="cx">
</span><ins>+add_screen_option( 'per_page', array('label' => _x( 'Users', 'users per page (screen options)' )) );
+
</ins><span class="cx"> add_contextual_help($current_screen,
</span><span class="cx"> '<p>' . __('This table shows all users across the network and the sites to which they are assigned.') . '</p>' .
</span><span class="cx"> '<p>' . __('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.') . '</p>' .
</span></span></pre></div>
<a id="trunkwpadminpluginsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/plugins.php (15745 => 15746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/plugins.php 2010-10-07 18:14:53 UTC (rev 15745)
+++ trunk/wp-admin/plugins.php 2010-10-07 19:34:18 UTC (rev 15746)
</span><span class="lines">@@ -290,6 +290,8 @@
</span><span class="cx"> wp_enqueue_script('plugin-install');
</span><span class="cx"> add_thickbox();
</span><span class="cx">
</span><ins>+add_screen_option( 'per_page', array('label' => _x( 'Plugins', 'plugins per page (screen options)' ), 'default' => 999) );
+
</ins><span class="cx"> add_contextual_help($current_screen,
</span><span class="cx"> '<p>' . __('Plugins extend and expand the functionality of WordPress. Once a plugin is installed, you may activate it or deactivate it here.') . '</p>' .
</span><span class="cx"> '<p>' . sprintf(__('You can find additional plugins for your site by using the <a href="%1$s">Plugin Browser/Installer</a> functionality or by browsing the <a href="%2$s" target="_blank">WordPress Plugin Directory</a> directly and installing new plugins manually. To manually install a plugin you generally just need to upload the plugin file into your <code>/wp-content/plugins</code> directory. Once a plugin has been installed, you can activate it here.'), 'plugin-install.php', 'http://wordpress.org/extend/plugins/') . '</p>' .
</span></span></pre></div>
<a id="trunkwpadminuploadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/upload.php (15745 => 15746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/upload.php 2010-10-07 18:14:53 UTC (rev 15745)
+++ trunk/wp-admin/upload.php 2010-10-07 19:34:18 UTC (rev 15746)
</span><span class="lines">@@ -134,6 +134,8 @@
</span><span class="cx"> wp_enqueue_script( 'jquery-ui-draggable' );
</span><span class="cx"> wp_enqueue_script( 'media' );
</span><span class="cx">
</span><ins>+add_screen_option( 'per_page', array('label' => _x( 'Media items', 'items per page (screen options)' )) );
+
</ins><span class="cx"> add_contextual_help( $current_screen,
</span><span class="cx"> '<p>' . __('All the files you&#8217;ve uploaded are listed in the Media Library, with the most recent uploads listed first. You can use the <em>Screen Options</em> tab to customize the display of this screen.') . '</p>' .
</span><span class="cx"> '<p>' . __('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.') . '</p>' .
</span></span></pre></div>
<a id="trunkwpadminuseradminphp"></a>
<div class="addfile"><h4>Added: trunk/wp-admin/user/admin.php (0 => 15746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/user/admin.php (rev 0)
+++ trunk/wp-admin/user/admin.php 2010-10-07 19:34:18 UTC (rev 15746)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+<?php
+
+define('WP_USER_ADMIN', TRUE);
+
+require_once( dirname(dirname(__FILE__)) . '/admin.php');
+
+if ( ! is_main_site() )
+ wp_redirect( user_admin_url() );
+
+?>
</ins><span class="cx">Property changes on: trunk/wp-admin/user/admin.php
</span><span class="cx">___________________________________________________________________
</span><span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre></div>
<a id="trunkwpadminuserindexextraphp"></a>
<div class="addfile"><h4>Added: trunk/wp-admin/user/index-extra.php (0 => 15746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/user/index-extra.php (rev 0)
+++ trunk/wp-admin/user/index-extra.php 2010-10-07 19:34:18 UTC (rev 15746)
</span><span class="lines">@@ -0,0 +1,5 @@
</span><ins>+<?php
+
+require_once( './admin.php' );
+
+require( '../index-extra.php' );
</ins><span class="cx">Property changes on: trunk/wp-admin/user/index-extra.php
</span><span class="cx">___________________________________________________________________
</span><span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre></div>
<a id="trunkwpadminuserindexphp"></a>
<div class="addfile"><h4>Added: trunk/wp-admin/user/index.php (0 => 15746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/user/index.php (rev 0)
+++ trunk/wp-admin/user/index.php 2010-10-07 19:34:18 UTC (rev 15746)
</span><span class="lines">@@ -0,0 +1,5 @@
</span><ins>+<?php
+
+require_once( './admin.php' );
+
+require( '../index.php' );
</ins><span class="cx">Property changes on: trunk/wp-admin/user/index.php
</span><span class="cx">___________________________________________________________________
</span><span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre></div>
<a id="trunkwpadminusermenuphp"></a>
<div class="addfile"><h4>Added: trunk/wp-admin/user/menu.php (0 => 15746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/user/menu.php (rev 0)
+++ trunk/wp-admin/user/menu.php 2010-10-07 19:34:18 UTC (rev 15746)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+<?php
+
+$menu[0] = array(__('Dashboard'), 'exist', 'index.php', '', 'menu-top menu-top-first menu-icon-dashboard', 'menu-dashboard', 'div');
+
+$menu[4] = array( '', 'exist', 'separator1', '', 'wp-menu-separator' );
+
+$menu[70] = array( __('Profile'), 'exist', 'profile.php', '', 'menu-top menu-icon-users', 'menu-users', 'div' );
+
+$menu[99] = array( '', 'exist', 'separator-last', '', 'wp-menu-separator-last' );
+
+$_wp_real_parent_file['users.php'] = 'profile.php';
+$compat = array();
+$submenu = array();
+
+require_once(ABSPATH . 'wp-admin/includes/menu.php');
+
+?>
</ins><span class="cx">\ No newline at end of file
</span><span class="cx">Property changes on: trunk/wp-admin/user/menu.php
</span><span class="cx">___________________________________________________________________
</span><span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre></div>
<a id="trunkwpadminuserprofilephp"></a>
<div class="addfile"><h4>Added: trunk/wp-admin/user/profile.php (0 => 15746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/user/profile.php (rev 0)
+++ trunk/wp-admin/user/profile.php 2010-10-07 19:34:18 UTC (rev 15746)
</span><span class="lines">@@ -0,0 +1,5 @@
</span><ins>+<?php
+
+require_once( './admin.php' );
+
+require( '../profile.php' );
</ins><span class="cx">\ No newline at end of file
</span><span class="cx">Property changes on: trunk/wp-admin/user/profile.php
</span><span class="cx">___________________________________________________________________
</span><span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre></div>
<a id="trunkwpadminuserusereditphp"></a>
<div class="addfile"><h4>Added: trunk/wp-admin/user/user-edit.php (0 => 15746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/user/user-edit.php (rev 0)
+++ trunk/wp-admin/user/user-edit.php 2010-10-07 19:34:18 UTC (rev 15746)
</span><span class="lines">@@ -0,0 +1,5 @@
</span><ins>+<?php
+
+require_once( './admin.php' );
+
+require( '../user-edit.php' );
</ins><span class="cx">\ No newline at end of file
</span><span class="cx">Property changes on: trunk/wp-admin/user/user-edit.php
</span><span class="cx">___________________________________________________________________
</span><span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre></div>
<a id="trunkwpadminusereditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/user-edit.php (15745 => 15746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/user-edit.php 2010-10-07 18:14:53 UTC (rev 15745)
+++ trunk/wp-admin/user-edit.php 2010-10-07 19:34:18 UTC (rev 15746)
</span><span class="lines">@@ -31,8 +31,12 @@
</span><span class="cx"> $submenu_file = 'users.php';
</span><span class="cx"> else
</span><span class="cx"> $submenu_file = 'profile.php';
</span><del>-$parent_file = 'users.php';
</del><span class="cx">
</span><ins>+if ( current_user_can('edit_users') && !is_user_admin() )
+ $parent_file = 'users.php';
+else
+ $parent_file = 'profile.php';
+
</ins><span class="cx"> // contextual help - choose Help on the top right of admin panel to preview this.
</span><span class="cx"> add_contextual_help($current_screen,
</span><span class="cx"> '<p>' . __('Your profile contains information about you (your &#8220;account&#8221;) as well as some personal options related to using WordPress.') . '</p>' .
</span></span></pre></div>
<a id="trunkwpadminusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/users.php (15745 => 15746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/users.php 2010-10-07 18:14:53 UTC (rev 15745)
+++ trunk/wp-admin/users.php 2010-10-07 19:34:18 UTC (rev 15746)
</span><span class="lines">@@ -18,6 +18,8 @@
</span><span class="cx"> $title = __('Users');
</span><span class="cx"> $parent_file = 'users.php';
</span><span class="cx">
</span><ins>+add_screen_option( 'per_page', array('label' => _x( 'Users', 'users per page (screen options)' )) );
+
</ins><span class="cx"> // contextual help - choose Help on the top right of admin panel to preview this.
</span><span class="cx"> add_contextual_help($current_screen,
</span><span class="cx"> '<p>' . __('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.') . '</p>' .
</span></span></pre></div>
<a id="trunkwpincludesadminbaradminbarclassphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/admin-bar/admin-bar-class.php (15745 => 15746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/admin-bar/admin-bar-class.php 2010-10-07 18:14:53 UTC (rev 15745)
+++ trunk/wp-includes/admin-bar/admin-bar-class.php 2010-10-07 19:34:18 UTC (rev 15746)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx"> $this->user->blogs = get_ordered_blogs_of_user( $current_user->id );
</span><span class="cx"> if ( is_multisite() ) {
</span><span class="cx"> $this->user->active_blog = get_active_blog_for_user( $current_user->id );
</span><del>- $this->user->domain = ( $this->user->active_blog == 'username only' ) ? get_dashboard_blog() : trailingslashit( get_home_url( $this->user->active_blog->blog_id ) );
</del><ins>+ $this->user->domain = empty( $this->user->active_blog ) ? user_admin_url() : trailingslashit( get_home_url( $this->user->active_blog->blog_id ) );
</ins><span class="cx"> $this->user->account_domain = $this->user->domain;
</span><span class="cx"> } else {
</span><span class="cx"> $this->user->active_blog = $this->user->blogs[$blog_id];
</span></span></pre></div>
<a id="trunkwpincludesadminbarphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/admin-bar.php (15745 => 15746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/admin-bar.php 2010-10-07 18:14:53 UTC (rev 15745)
+++ trunk/wp-includes/admin-bar.php 2010-10-07 19:34:18 UTC (rev 15746)
</span><span class="lines">@@ -110,14 +110,6 @@
</span><span class="cx"> if ( !is_object( $wp_admin_bar ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- /* 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] );
- }
- }
-
</del><span class="cx"> /* Add the 'My Dashboards' menu if the user has more than one blog. */
</span><span class="cx"> if ( count( $wp_admin_bar->user->blogs ) > 1 ) {
</span><span class="cx"> $wp_admin_bar->add_menu( array( 'id' => 'my-blogs', 'title' => __( 'My Blogs' ), 'href' => $wp_admin_bar->user->account_domain ) );
</span></span></pre></div>
<a id="trunkwpincludescapabilitiesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/capabilities.php (15745 => 15746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/capabilities.php 2010-10-07 18:14:53 UTC (rev 15745)
+++ trunk/wp-includes/capabilities.php 2010-10-07 19:34:18 UTC (rev 15746)
</span><span class="lines">@@ -737,6 +737,7 @@
</span><span class="cx">
</span><span class="cx"> // Must have ALL requested caps
</span><span class="cx"> $capabilities = apply_filters( 'user_has_cap', $this->allcaps, $caps, $args );
</span><ins>+ $capabilities['exist'] = true; // Everyone is allowed to exist
</ins><span class="cx"> foreach ( (array) $caps as $cap ) {
</span><span class="cx"> //echo "Checking cap $cap<br />";
</span><span class="cx"> if ( empty( $capabilities[$cap] ) || !$capabilities[$cap] )
</span></span></pre></div>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (15745 => 15746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2010-10-07 18:14:53 UTC (rev 15745)
+++ trunk/wp-includes/functions.php 2010-10-07 19:34:18 UTC (rev 15746)
</span><span class="lines">@@ -447,7 +447,7 @@
</span><span class="cx"> if ( empty($site_id) )
</span><span class="cx"> $site_id = $wpdb->siteid;
</span><span class="cx">
</span><del>- $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' );
</del><ins>+ $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' );
</ins><span class="cx">
</span><span class="cx"> $core_options_in = "'" . implode("', '", $core_options) . "'";
</span><span class="cx"> $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) );
</span></span></pre></div>
<a id="trunkwpincludeslinktemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/link-template.php (15745 => 15746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/link-template.php 2010-10-07 18:14:53 UTC (rev 15745)
+++ trunk/wp-includes/link-template.php 2010-10-07 19:34:18 UTC (rev 15746)
</span><span class="lines">@@ -2130,6 +2130,25 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * 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);
+}
+
+/**
</ins><span class="cx"> * Retrieve the url to the admin area for either the current blog or the network depending on context.
</span><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><span class="lines">@@ -2142,6 +2161,8 @@
</span><span class="cx"> function self_admin_url($path = '', $scheme = 'admin') {
</span><span class="cx"> if ( is_network_admin() )
</span><span class="cx"> return network_admin_url($path, $scheme);
</span><ins>+ elseif ( is_user_admin() )
+ return user_admin_url($path, $scheme);
</ins><span class="cx"> else
</span><span class="cx"> return admin_url($path, $scheme);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesloadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/load.php (15745 => 15746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/load.php 2010-10-07 18:14:53 UTC (rev 15745)
+++ trunk/wp-includes/load.php 2010-10-07 19:34:18 UTC (rev 15746)
</span><span class="lines">@@ -621,6 +621,22 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * 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;
+}
+
+/**
</ins><span class="cx"> * Whether Multisite support is enabled
</span><span class="cx"> *
</span><span class="cx"> * @since 3.0.0
</span></span></pre></div>
<a id="trunkwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-functions.php (15745 => 15746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-functions.php 2010-10-07 18:14:53 UTC (rev 15745)
+++ trunk/wp-includes/ms-functions.php 2010-10-07 19:34:18 UTC (rev 15746)
</span><span class="lines">@@ -59,7 +59,6 @@
</span><span class="cx"> *
</span><span class="cx"> * @since MU 1.0
</span><span class="cx"> * @uses get_blogs_of_user()
</span><del>- * @uses get_dashboard_blog()
</del><span class="cx"> * @uses add_user_to_blog()
</span><span class="cx"> * @uses update_user_meta()
</span><span class="cx"> * @uses wp_cache_delete()
</span><span class="lines">@@ -72,30 +71,29 @@
</span><span class="cx"> function get_active_blog_for_user( $user_id ) {
</span><span class="cx"> global $wpdb;
</span><span class="cx"> $blogs = get_blogs_of_user( $user_id );
</span><del>- 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;
- }
</del><ins>+ if ( empty( $blogs ) )
+ return null;
</ins><span class="cx">
</span><ins>+ if ( !is_multisite() )
+ return $blogs[$wpdb->blogid];
+
</ins><span class="cx"> $primary_blog = get_user_meta( $user_id, 'primary_blog', true );
</span><del>- $details = get_dashboard_blog();
</del><ins>+ $first_blog = current($blogs);
</ins><span class="cx"> if ( $primary_blog ) {
</span><del>- 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' );
</del><ins>+ 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;
</ins><span class="cx"> } else {
</span><del>- $details = get_blog_details( $primary_blog );
</del><ins>+ $primary = get_blog_details( $primary_blog );
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- 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 );
</del><ins>+ 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;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if ( ( is_object( $details ) == false ) || ( is_object( $details ) && $details->archived == 1 || $details->spam == 1 || $details->deleted == 1 ) ) {
</del><ins>+ if ( ( ! is_object( $primary ) ) || ( is_object( $primary ) && $primary->archived == 1 || $primary->spam == 1 || $primary->deleted == 1 ) ) {
</ins><span class="cx"> $blogs = get_blogs_of_user( $user_id, true ); // if a user's primary blog is shut down, check their other blogs.
</span><span class="cx"> $ret = false;
</span><span class="cx"> if ( is_array( $blogs ) && count( $blogs ) > 0 ) {
</span><span class="lines">@@ -105,30 +103,19 @@
</span><span class="cx"> $details = get_blog_details( $blog_id );
</span><span class="cx"> if ( is_object( $details ) && $details->archived == 0 && $details->spam == 0 && $details->deleted == 0 ) {
</span><span class="cx"> $ret = $blog;
</span><del>- $changed = false;
- if ( get_user_meta( $user_id , 'primary_blog', true ) != $blog_id ) {
</del><ins>+ if ( get_user_meta( $user_id , 'primary_blog', true ) != $blog_id )
</ins><span class="cx"> update_user_meta( $user_id, 'primary_blog', $blog_id );
</span><del>- $changed = true;
- }
- if ( !get_user_meta($user_id , 'source_domain', true) ) {
</del><ins>+ if ( !get_user_meta($user_id , 'source_domain', true) )
</ins><span class="cx"> update_user_meta( $user_id, 'source_domain', $blog->domain );
</span><del>- $changed = true;
- }
- if ( $changed )
- wp_cache_delete( $user_id, 'users' );
</del><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- // 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;
</del><ins>+ return null;
</ins><span class="cx"> }
</span><span class="cx"> return $ret;
</span><span class="cx"> } else {
</span><del>- return $details;
</del><ins>+ return $primary;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -840,13 +827,7 @@
</span><span class="cx"> return new WP_Error( 'user_already_exists', __( 'That username is already activated.' ), $signup);
</span><span class="cx">
</span><span class="cx"> wpmu_welcome_user_notification($user_id, $password, $meta);
</span><del>- $user_site = get_site_option( 'dashboard_blog', $current_site->blog_id );
</del><span class="cx">
</span><del>- 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' ) );
-
</del><span class="cx"> add_new_user_to_blog( $user_id, $user_email, $meta );
</span><span class="cx"> do_action('wpmu_activate_user', $user_id, $password, $meta);
</span><span class="cx"> return array('user_id' => $user_id, 'password' => $password, 'meta' => $meta);
</span><span class="lines">@@ -926,7 +907,7 @@
</span><span class="cx"> add_option( 'WPLANG', get_site_option( 'WPLANG' ) );
</span><span class="cx"> update_option( 'blog_public', (int)$meta['public'] );
</span><span class="cx">
</span><del>- if ( !is_super_admin() && get_user_meta( $user_id, 'primary_blog', true ) == get_site_option( 'dashboard_blog', 1 ) )
</del><ins>+ if ( !is_super_admin() && ! get_user_meta( $user_id, 'primary_blog', true ) )
</ins><span class="cx"> update_user_meta( $user_id, 'primary_blog', $blog_id );
</span><span class="cx">
</span><span class="cx"> restore_current_blog();
</span><span class="lines">@@ -1460,19 +1441,6 @@
</span><span class="cx"> }
</span><span class="cx"> add_action('update_option_blog_public', 'update_blog_public', 10, 2);
</span><span class="cx">
</span><del>-/* 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' );
-
</del><span class="cx"> function get_dashboard_blog() {
</span><span class="cx"> if ( $blog = get_site_option( 'dashboard_blog' ) )
</span><span class="cx"> return get_blog_details( $blog );
</span></span></pre></div>
<a id="trunkwpincludespluggablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/pluggable.php (15745 => 15746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/pluggable.php 2010-10-07 18:14:53 UTC (rev 15745)
+++ trunk/wp-includes/pluggable.php 2010-10-07 19:34:18 UTC (rev 15746)
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if ( ! $user = wp_validate_auth_cookie() ) {
</span><del>- if ( is_admin() || empty($_COOKIE[LOGGED_IN_COOKIE]) || !$user = wp_validate_auth_cookie($_COOKIE[LOGGED_IN_COOKIE], 'logged_in') ) {
</del><ins>+ if ( is_blog_admin() || is_network_admin() || empty($_COOKIE[LOGGED_IN_COOKIE]) || !$user = wp_validate_auth_cookie($_COOKIE[LOGGED_IN_COOKIE], 'logged_in') ) {
</ins><span class="cx"> wp_set_current_user(0);
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="lines">@@ -775,7 +775,12 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( $user_id = wp_validate_auth_cookie( '', apply_filters( 'auth_redirect_scheme', '' ) ) ) {
</del><ins>+ if ( is_user_admin() )
+ $scheme = 'logged_in';
+ else
+ $scheme = apply_filters( 'auth_redirect_scheme', '' );
+
+ if ( $user_id = wp_validate_auth_cookie( '', $scheme) ) {
</ins><span class="cx"> do_action('auth_redirect', $user_id);
</span><span class="cx">
</span><span class="cx"> // If the user wants ssl but the session is not ssl, redirect.
</span></span></pre></div>
<a id="trunkwpincludesvarsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/vars.php (15745 => 15746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/vars.php 2010-10-07 18:14:53 UTC (rev 15745)
+++ trunk/wp-includes/vars.php 2010-10-07 19:34:18 UTC (rev 15746)
</span><span class="lines">@@ -15,7 +15,12 @@
</span><span class="cx"> // On which page are we ?
</span><span class="cx"> if ( is_admin() ) {
</span><span class="cx"> // wp-admin pages are checked more carefully
</span><del>- preg_match('#/wp-admin/?(.*?)$#i', $PHP_SELF, $self_matches);
</del><ins>+ 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);
</ins><span class="cx"> $pagenow = $self_matches[1];
</span><span class="cx"> $pagenow = trim($pagenow, '/');
</span><span class="cx"> $pagenow = preg_replace('#\?.*?$#', '', $pagenow);
</span></span></pre></div>
<a id="trunkwploginphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-login.php (15745 => 15746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-login.php 2010-10-07 18:14:53 UTC (rev 15745)
+++ trunk/wp-login.php 2010-10-07 19:34:18 UTC (rev 15746)
</span><span class="lines">@@ -572,8 +572,13 @@
</span><span class="cx"> </div></body></html>
</span><span class="cx"> <?php exit;
</span><span class="cx"> }
</span><del>- // If the user can't edit posts, send them to their profile.
- if ( !$user->has_cap('edit_posts') && ( empty( $redirect_to ) || $redirect_to == 'wp-admin/' || $redirect_to == admin_url() ) )
</del><ins>+
+ // If the user doesn't belong to a blog, send them to user admin. If the user can't edit posts, send them to their profile.
+ if ( is_multisite() && !get_active_blog_for_user($user->id) )
+ $redirect_to = user_admin_url();
+ elseif ( !is_multisite() && !$user->has_cap('read') )
+ $redirect_to = user_admin_url();
+ elseif ( !$user->has_cap('edit_posts') && ( empty( $redirect_to ) || $redirect_to == 'wp-admin/' || $redirect_to == admin_url() ) )
</ins><span class="cx"> $redirect_to = admin_url('profile.php');
</span><span class="cx"> wp_safe_redirect($redirect_to);
</span><span class="cx"> exit();
</span></span></pre>
</div>
</div>
</body>
</html>