<!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>[12618] trunk/wp-admin: Move wpmu_menu() logic into menu.php.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12618">12618</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-01-07 00:17:13 +0000 (Thu, 07 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move wpmu_menu() logic into menu.php. Props Denis-de-Bernardy. fixes <a href="http://trac.wordpress.org/ticket/11763">#11763</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesmsphp">trunk/wp-admin/includes/ms.php</a></li>
<li><a href="#trunkwpadminmenuphp">trunk/wp-admin/menu.php</a></li>
<li><a href="#trunkwpadminpluginsphp">trunk/wp-admin/plugins.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesmsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/ms.php (12617 => 12618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ms.php 2010-01-07 00:13:35 UTC (rev 12617)
+++ trunk/wp-admin/includes/ms.php 2010-01-07 00:17:13 UTC (rev 12618)
</span><span class="lines">@@ -549,34 +549,8 @@
</span><span class="cx"> add_action( 'admin_page_access_denied', 'redirect_user_to_blog', 99 );
</span><span class="cx">
</span><span class="cx"> function wpmu_menu() {
</span><del>- global $menu, $submenu, $current_user;
-
- $menu_perms = get_site_option( "menu_items" );
- if( is_array( $menu_perms ) == false )
- $menu_perms = array();
- if( $menu_perms[ 'plugins' ] != 1 ) {
- if( !is_site_admin() ) {
- unset( $menu['65'] ); // Plugins
- unset( $submenu[ 'plugins.php' ] );
- } elseif ( strpos( $_SERVER[ 'PHP_SELF' ], 'wp-admin/plugins.php' ) ) {
- $message = sprintf( __( 'The plugins page is not visible to normal users. It must be activated first. %s' ), '<a href="wpmu-options.php#menu">' . __( 'Activate' ) . '</a>' );
- $message = str_replace( "'", "\'", "<div class='error'><p>$message</p></div>" );
- add_action( 'admin_notices', create_function( '', "echo '$message';" ) );
- }
- } elseif ( !is_site_admin() ) {
- $menu[65] = array( sprintf( __('Plugins %s'), "" ), 'activate_plugins', 'plugins.php', '', 'menu-top', 'menu-plugins', 'div' );
- }
- if( !get_site_option( 'add_new_users' ) ) {
- if( !is_site_admin() ) {
- unset( $submenu['users.php'][10] );
- } else {
- $submenu['users.php'][10] = array(__('Add New') . ' <strong>*</strong>', 'create_users', 'wpmu-options.php#addnewusers');
- }
- }
- unset( $submenu['tools.php'][20] ); // core upgrade
- unset( $submenu['options-general.php'][45] ); // Misc
</del><ins>+ // deprecated. See #11763
</ins><span class="cx"> }
</span><del>-add_action( '_admin_menu', 'wpmu_menu' );
</del><span class="cx">
</span><span class="cx"> function mu_options( $options ) {
</span><span class="cx"> if ( defined( 'POST_BY_EMAIL' ) ) {
</span></span></pre></div>
<a id="trunkwpadminmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/menu.php (12617 => 12618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/menu.php 2010-01-07 00:13:35 UTC (rev 12617)
+++ trunk/wp-admin/menu.php 2010-01-07 00:17:13 UTC (rev 12618)
</span><span class="lines">@@ -109,14 +109,17 @@
</span><span class="cx"> if ( !empty($update_plugins->response) )
</span><span class="cx"> $update_count = count( $update_plugins->response );
</span><span class="cx">
</span><del>-$menu[65] = array( sprintf( __('Plugins %s'), "<span class='update-plugins count-$update_count'><span class='plugin-count'>" . number_format_i18n($update_count) . "</span></span>" ), 'activate_plugins', 'plugins.php', '', 'menu-top', 'menu-plugins', 'div' );
- $submenu['plugins.php'][5] = array( __('Installed'), 'activate_plugins', 'plugins.php' );
- if ( is_super_admin() ) {
- /* translators: add new plugin */
- $submenu['plugins.php'][10] = array(_x('Add New', 'plugin'), 'install_plugins', 'plugin-install.php');
- }
- if ( !is_multisite() )
- $submenu['plugins.php'][15] = array( __('Editor'), 'edit_plugins', 'plugin-editor.php' );
</del><ins>+$menu_perms = get_site_option('menu_items', array());
+if ( is_super_admin() || is_multisite() && $menu_perms['plugins'] ) {
+ $menu[65] = array( sprintf( __('Plugins %s'), "<span class='update-plugins count-$update_count'><span class='plugin-count'>" . number_format_i18n($update_count) . "</span></span>" ), 'activate_plugins', 'plugins.php', '', 'menu-top', 'menu-plugins', 'div' );
+ $submenu['plugins.php'][5] = array( __('Installed'), 'activate_plugins', 'plugins.php' );
+ if ( is_super_admin() ) {
+ /* translators: add new plugin */
+ $submenu['plugins.php'][10] = array(_x('Add New', 'plugin'), 'install_plugins', 'plugin-install.php');
+ }
+ if ( !is_multisite() )
+ $submenu['plugins.php'][15] = array( __('Editor'), 'edit_plugins', 'plugin-editor.php' );
+}
</ins><span class="cx">
</span><span class="cx"> if ( current_user_can('edit_users') )
</span><span class="cx"> $menu[70] = array( __('Users'), 'edit_users', 'users.php', '', 'menu-top', 'menu-users', 'div' );
</span><span class="lines">@@ -126,7 +129,11 @@
</span><span class="cx"> if ( current_user_can('edit_users') ) {
</span><span class="cx"> $_wp_real_parent_file['profile.php'] = 'users.php'; // Back-compat for plugins adding submenus to profile.php.
</span><span class="cx"> $submenu['users.php'][5] = array(__('Authors &amp; Users'), 'edit_users', 'users.php');
</span><del>- $submenu['users.php'][10] = array(_x('Add New', 'user'), 'create_users', 'user-new.php');
</del><ins>+ if ( !is_multisite() )
+ $submenu['users.php'][10] = array(_x('Add New', 'user'), 'create_users', 'user-new.php');
+ elseif ( is_super_admin() || get_site_option( 'add_new_users' ) )
+ $submenu['users.php'][10] = array(__('Add New') . ' <strong>*</strong>', 'create_users', 'ms-options.php#addnewusers');
+
</ins><span class="cx"> $submenu['users.php'][15] = array(__('Your Profile'), 'read', 'profile.php');
</span><span class="cx"> } else {
</span><span class="cx"> $_wp_real_parent_file['users.php'] = 'profile.php';
</span><span class="lines">@@ -137,7 +144,8 @@
</span><span class="cx"> $submenu['tools.php'][5] = array( __('Tools'), 'read', 'tools.php' );
</span><span class="cx"> $submenu['tools.php'][10] = array( __('Import'), 'import', 'import.php' );
</span><span class="cx"> $submenu['tools.php'][15] = array( __('Export'), 'import', 'export.php' );
</span><del>- $submenu['tools.php'][20] = array( __('Upgrade'), 'install_plugins', 'update-core.php');
</del><ins>+ if ( is_super_admin() )
+ $submenu['tools.php'][20] = array( __('Upgrade'), 'install_plugins', 'update-core.php');
</ins><span class="cx">
</span><span class="cx"> $menu[80] = array( __('Settings'), 'manage_options', 'options-general.php', '', 'menu-top', 'menu-settings', 'div' );
</span><span class="cx"> $submenu['options-general.php'][10] = array(__('General'), 'manage_options', 'options-general.php');
</span><span class="lines">@@ -147,7 +155,8 @@
</span><span class="cx"> $submenu['options-general.php'][30] = array(__('Media'), 'manage_options', 'options-media.php');
</span><span class="cx"> $submenu['options-general.php'][35] = array(__('Privacy'), 'manage_options', 'options-privacy.php');
</span><span class="cx"> $submenu['options-general.php'][40] = array(__('Permalinks'), 'manage_options', 'options-permalink.php');
</span><del>- $submenu['options-general.php'][45] = array(__('Miscellaneous'), 'manage_options', 'options-misc.php');
</del><ins>+ if ( is_super_admin() )
+ $submenu['options-general.php'][45] = array(__('Miscellaneous'), 'manage_options', 'options-misc.php');
</ins><span class="cx">
</span><span class="cx"> $_wp_last_utility_menu = 80; // The index of the last top-level menu in the utility menu group
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminpluginsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/plugins.php (12617 => 12618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/plugins.php 2010-01-07 00:13:35 UTC (rev 12617)
+++ trunk/wp-admin/plugins.php 2010-01-07 00:17:13 UTC (rev 12618)
</span><span class="lines">@@ -236,6 +236,15 @@
</span><span class="cx">
</span><span class="cx"> add_contextual_help('plugins', $help);
</span><span class="cx">
</span><ins>+if ( is_multisite() && is_super_admin() ) {
+ $menu_perms = get_site_option('menu_items', array());
+ if ( !$menu_perms['plugins'] ) {
+ $message = sprintf( __( 'The plugins page is not visible to normal users. It must be activated first. %s' ), '<a href="ms-options.php#menu">' . __( 'Activate' ) . '</a>' );
+ $message = str_replace( "'", "\'", "<div class='error'><p>$message</p></div>" );
+ add_action( 'admin_notices', create_function( '', "echo '$message';" ) );
+ }
+}
+
</ins><span class="cx"> $title = __('Manage Plugins');
</span><span class="cx"> require_once('admin-header.php');
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>