<!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>[16747] trunk: Link to network/update-core when running multisite.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16747">16747</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-12-06 15:41:19 +0000 (Mon, 06 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Link to network/update-core when running multisite. Remove theme/plugin editors from blog menu when running multisite. Redirect to network/* when accessing theme/plugin-install/editor. props ocean90, see <a href="http://trac.wordpress.org/ticket/15525">#15525</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesupdatephp">trunk/wp-admin/includes/update.php</a></li>
<li><a href="#trunkwpadminmenuphp">trunk/wp-admin/menu.php</a></li>
<li><a href="#trunkwpadminplugineditorphp">trunk/wp-admin/plugin-editor.php</a></li>
<li><a href="#trunkwpadminplugininstallphp">trunk/wp-admin/plugin-install.php</a></li>
<li><a href="#trunkwpadminthemeeditorphp">trunk/wp-admin/theme-editor.php</a></li>
<li><a href="#trunkwpadminthemeinstallphp">trunk/wp-admin/theme-install.php</a></li>
<li><a href="#trunkwpadminthemesphp">trunk/wp-admin/themes.php</a></li>
<li><a href="#trunkwpadminupdatecorephp">trunk/wp-admin/update-core.php</a></li>
<li><a href="#trunkwpincludesadminbarphp">trunk/wp-includes/admin-bar.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesupdatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/update.php (16746 => 16747)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/update.php 2010-12-06 15:26:30 UTC (rev 16746)
+++ trunk/wp-admin/includes/update.php 2010-12-06 15:41:19 UTC (rev 16747)
</span><span class="lines">@@ -98,13 +98,15 @@
</span><span class="cx"> if ( ! isset( $cur->response ) )
</span><span class="cx"> $cur->response = '';
</span><span class="cx">
</span><ins>+ $href = is_multisite() ? network_admin_url( 'update-core.php' ) : admin_url( 'update-core.php' );
+
</ins><span class="cx"> switch ( $cur->response ) {
</span><span class="cx"> case 'development' :
</span><del>- return sprintf( __( 'You are using a development version (%1$s). Cool! Please <a href="%2$s">stay updated</a>.' ), $GLOBALS['wp_version'], 'update-core.php');
</del><ins>+ return sprintf( __( 'You are using a development version (%1$s). Cool! Please <a href="%2$s">stay updated</a>.' ), $GLOBALS['wp_version'], $href );
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case 'upgrade' :
</span><del>- return sprintf( '<strong>'.__( '<a href="%1$s">Get Version %2$s</a>' ).'</strong>', 'update-core.php', $cur->current);
</del><ins>+ return sprintf( '<strong>'.__( '<a href="%1$s">Get Version %2$s</a>' ).'</strong>', $href, $cur->current);
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case 'latest' :
</span><span class="lines">@@ -129,11 +131,12 @@
</span><span class="cx"> if ( ! isset( $cur->response ) || $cur->response != 'upgrade' )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if ( current_user_can('update_core') )
- $msg = sprintf( __('<a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> is available! <a href="%2$s">Please update now</a>.'), $cur->current, 'update-core.php' );
- else
</del><ins>+ if ( current_user_can('update_core') ) {
+ $href = is_multisite() ? network_admin_url( 'update-core.php' ) : admin_url( 'update-core.php' );
+ $msg = sprintf( __('<a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> is available! <a href="%2$s">Please update now</a>.'), $cur->current, $href );
+ } else {
</ins><span class="cx"> $msg = sprintf( __('<a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> is available! Please notify the site administrator.'), $cur->current );
</span><del>-
</del><ins>+ }
</ins><span class="cx"> echo "<div class='update-nag'>$msg</div>";
</span><span class="cx"> }
</span><span class="cx"> add_action( 'admin_notices', 'update_nag', 3 );
</span><span class="lines">@@ -146,9 +149,12 @@
</span><span class="cx"> $cur = get_preferred_from_update_core();
</span><span class="cx">
</span><span class="cx"> $msg = sprintf( __('You are using <span class="b">WordPress %s</span>.'), $GLOBALS['wp_version'] );
</span><del>- if ( isset( $cur->response ) && $cur->response == 'upgrade' && current_user_can('update_core') )
- $msg .= " <a href='update-core.php' class='button'>" . sprintf( __('Update to %s'), $cur->current ? $cur->current : __( 'Latest' ) ) . '</a>';
</del><span class="cx">
</span><ins>+ if ( isset( $cur->response ) && $cur->response == 'upgrade' && current_user_can('update_core') ) {
+ $href = is_multisite() ? network_admin_url( 'update-core.php' ) : admin_url( 'update-core.php' );
+ $msg .= " <a href='" . $href . "' class='button'>" . sprintf( __('Update to %s'), $cur->current ? $cur->current : __( 'Latest' ) ) . '</a>';
+ }
+
</ins><span class="cx"> echo "<span id='wp-version-message'>$msg</span>";
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/menu.php (16746 => 16747)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/menu.php 2010-12-06 15:26:30 UTC (rev 16746)
+++ trunk/wp-admin/menu.php 2010-12-06 15:41:19 UTC (rev 16747)
</span><span class="lines">@@ -151,7 +151,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Add 'Editor' to the bottom of the Appearence menu.
</span><del>-add_action('admin_menu', '_add_themes_utility_last', 101);
</del><ins>+if ( ! is_multisite() )
+ add_action('admin_menu', '_add_themes_utility_last', 101);
</ins><span class="cx"> function _add_themes_utility_last() {
</span><span class="cx"> // Must use API on the admin_menu hook, direct modification is only possible on/before the _admin_menu hook
</span><span class="cx"> add_submenu_page('themes.php', _x('Editor', 'theme editor'), _x('Editor', 'theme editor'), 'edit_themes', 'theme-editor.php');
</span><span class="lines">@@ -171,7 +172,8 @@
</span><span class="cx"> $submenu['plugins.php'][5] = array( __('Plugins'), 'activate_plugins', 'plugins.php' );
</span><span class="cx"> /* translators: add new plugin */
</span><span class="cx"> $submenu['plugins.php'][10] = array(_x('Add New', 'plugin'), 'install_plugins', 'plugin-install.php');
</span><del>- $submenu['plugins.php'][15] = array( _x('Editor', 'plugin editor'), 'edit_plugins', 'plugin-editor.php' );
</del><ins>+ if ( ! is_multisite() )
+ $submenu['plugins.php'][15] = array( _x('Editor', 'plugin editor'), 'edit_plugins', 'plugin-editor.php' );
</ins><span class="cx"> }
</span><span class="cx"> unset($menu_perms, $update_plugins, $update_count);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminplugineditorphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/plugin-editor.php (16746 => 16747)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/plugin-editor.php 2010-12-06 15:26:30 UTC (rev 16746)
+++ trunk/wp-admin/plugin-editor.php 2010-12-06 15:41:19 UTC (rev 16747)
</span><span class="lines">@@ -9,6 +9,11 @@
</span><span class="cx"> /** WordPress Administration Bootstrap */
</span><span class="cx"> require_once('./admin.php');
</span><span class="cx">
</span><ins>+if ( is_multisite() && ! is_network_admin() ) {
+ wp_redirect( network_admin_url( 'plugin-editor.php' ) );
+ exit();
+}
+
</ins><span class="cx"> if ( !current_user_can('edit_plugins') )
</span><span class="cx"> wp_die( __('You do not have sufficient permissions to edit plugins for this site.') );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminplugininstallphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/plugin-install.php (16746 => 16747)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/plugin-install.php 2010-12-06 15:26:30 UTC (rev 16746)
+++ trunk/wp-admin/plugin-install.php 2010-12-06 15:41:19 UTC (rev 16747)
</span><span class="lines">@@ -12,6 +12,11 @@
</span><span class="cx"> /** WordPress Administration Bootstrap */
</span><span class="cx"> require_once('./admin.php');
</span><span class="cx">
</span><ins>+if ( is_multisite() && ! is_network_admin() ) {
+ wp_redirect( network_admin_url( 'plugin-install.php' ) );
+ exit();
+}
+
</ins><span class="cx"> $wp_list_table = get_list_table('WP_Plugin_Install_List_Table');
</span><span class="cx"> $wp_list_table->check_permissions();
</span><span class="cx"> $wp_list_table->prepare_items();
</span></span></pre></div>
<a id="trunkwpadminthemeeditorphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/theme-editor.php (16746 => 16747)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/theme-editor.php 2010-12-06 15:26:30 UTC (rev 16746)
+++ trunk/wp-admin/theme-editor.php 2010-12-06 15:41:19 UTC (rev 16747)
</span><span class="lines">@@ -9,6 +9,11 @@
</span><span class="cx"> /** WordPress Administration Bootstrap */
</span><span class="cx"> require_once('./admin.php');
</span><span class="cx">
</span><ins>+if ( is_multisite() && ! is_network_admin() ) {
+ wp_redirect( network_admin_url( 'theme-editor.php' ) );
+ exit();
+}
+
</ins><span class="cx"> if ( !current_user_can('edit_themes') )
</span><span class="cx"> wp_die('<p>'.__('You do not have sufficient permissions to edit templates for this site.').'</p>');
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminthemeinstallphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/theme-install.php (16746 => 16747)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/theme-install.php 2010-12-06 15:26:30 UTC (rev 16746)
+++ trunk/wp-admin/theme-install.php 2010-12-06 15:41:19 UTC (rev 16747)
</span><span class="lines">@@ -12,6 +12,11 @@
</span><span class="cx"> /** WordPress Administration Bootstrap */
</span><span class="cx"> require_once('./admin.php');
</span><span class="cx">
</span><ins>+if ( is_multisite() && ! is_network_admin() ) {
+ wp_redirect( network_admin_url( 'theme-install.php' ) );
+ exit();
+}
+
</ins><span class="cx"> $wp_list_table = get_list_table('WP_Theme_Install_List_Table');
</span><span class="cx"> $wp_list_table->check_permissions();
</span><span class="cx"> $wp_list_table->prepare_items();
</span></span></pre></div>
<a id="trunkwpadminthemesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/themes.php (16746 => 16747)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/themes.php 2010-12-06 15:26:30 UTC (rev 16746)
+++ trunk/wp-admin/themes.php 2010-12-06 15:41:19 UTC (rev 16747)
</span><span class="lines">@@ -73,7 +73,15 @@
</span><span class="cx">
</span><span class="cx"> <div class="wrap">
</span><span class="cx"> <?php screen_icon(); ?>
</span><del>-<h2 class="nav-tab-wrapper"><a href="themes.php" class="nav-tab nav-tab-active"><?php echo esc_html( $title ); ?></a><?php if ( current_user_can('install_themes') ) { ?><a href="theme-install.php" class="nav-tab"><?php echo esc_html_x('Install Themes', 'theme'); ?></a><?php } ?></h2>
</del><ins>+<h2 class="nav-tab-wrapper">
+<a href="themes.php" class="nav-tab nav-tab-active"><?php echo esc_html( $title ); ?></a>
+<?php
+if ( current_user_can('install_themes') ) {
+ $href = is_multisite() ? network_admin_url( 'theme-install.php' ) : admin_url( 'theme-install.php' );
+?>
+<a href="<?php echo $href; ?>" class="nav-tab"><?php echo esc_html_x('Install Themes', 'theme'); ?></a>
+<?php } ?>
+</h2>
</ins><span class="cx">
</span><span class="cx"> <h3><?php _e('Current Theme'); ?></h3>
</span><span class="cx"> <div id="current-theme">
</span></span></pre></div>
<a id="trunkwpadminupdatecorephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/update-core.php (16746 => 16747)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/update-core.php 2010-12-06 15:26:30 UTC (rev 16746)
+++ trunk/wp-admin/update-core.php 2010-12-06 15:41:19 UTC (rev 16747)
</span><span class="lines">@@ -9,6 +9,11 @@
</span><span class="cx"> /** WordPress Administration Bootstrap */
</span><span class="cx"> require_once('./admin.php');
</span><span class="cx">
</span><ins>+if ( is_multisite() && ! is_network_admin() ) {
+ wp_redirect( network_admin_url( 'update-core.php' ) );
+ exit();
+}
+
</ins><span class="cx"> if ( ! current_user_can('update_plugins') )
</span><span class="cx"> wp_die(__('You do not have sufficient permissions to update plugins for this site.'));
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesadminbarphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/admin-bar.php (16746 => 16747)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/admin-bar.php 2010-12-06 15:26:30 UTC (rev 16746)
+++ trunk/wp-includes/admin-bar.php 2010-12-06 15:41:19 UTC (rev 16747)
</span><span class="lines">@@ -278,7 +278,9 @@
</span><span class="cx">
</span><span class="cx"> $update_title = sprintf( __('Updates %s'), "<span id='ab-updates' class='count-$update_count' title='$update_title'><span class='update-count'>" . number_format_i18n($update_count) . "</span></span>" );
</span><span class="cx">
</span><del>- $wp_admin_bar->add_menu( array( 'id' => 'updates', 'title' => $update_title, 'href' => admin_url('update-core.php') ) );
</del><ins>+ $href = is_multisite() ? network_admin_url( 'update-core.php' ) : admin_url( 'update-core.php' );
+
+ $wp_admin_bar->add_menu( array( 'id' => 'updates', 'title' => $update_title, 'href' => $href ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>