<!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>[15871] trunk/wp-admin: Add update-core to network admin.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15871">15871</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-10-20 16:38:00 +0000 (Wed, 20 Oct 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add update-core to network admin. Props PeteMall. see <a href="http://trac.wordpress.org/ticket/15162">#15162</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesclasswpupgraderphp">trunk/wp-admin/includes/class-wp-upgrader.php</a></li>
<li><a href="#trunkwpadminnetworkmenuphp">trunk/wp-admin/network/menu.php</a></li>
<li><a href="#trunkwpadminupdatecorephp">trunk/wp-admin/update-core.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesclasswpupgraderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-upgrader.php (15870 => 15871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-upgrader.php 2010-10-20 16:09:55 UTC (rev 15870)
+++ trunk/wp-admin/includes/class-wp-upgrader.php 2010-10-20 16:38:00 UTC (rev 15871)
</span><span class="lines">@@ -1037,7 +1037,7 @@
</span><span class="cx">
</span><span class="cx"> $update_actions = array(
</span><span class="cx"> 'activate_plugin' => '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;plugin=' . $this->plugin, 'activate-plugin_' . $this->plugin) . '" title="' . esc_attr__('Activate this plugin') . '" target="_parent">' . __('Activate Plugin') . '</a>',
</span><del>- 'plugins_page' => '<a href="' . admin_url('plugins.php') . '" title="' . esc_attr__('Go to plugins page') . '" target="_parent">' . __('Return to Plugins page') . '</a>'
</del><ins>+ 'plugins_page' => '<a href="' . self_admin_url('plugins.php') . '" title="' . esc_attr__('Go to plugins page') . '" target="_parent">' . __('Return to Plugins page') . '</a>'
</ins><span class="cx"> );
</span><span class="cx"> if ( $this->plugin_active )
</span><span class="cx"> unset( $update_actions['activate_plugin'] );
</span><span class="lines">@@ -1195,8 +1195,8 @@
</span><span class="cx"> function bulk_footer() {
</span><span class="cx"> parent::bulk_footer();
</span><span class="cx"> $update_actions = array(
</span><del>- 'plugins_page' => '<a href="' . admin_url('plugins.php') . '" title="' . esc_attr__('Go to plugins page') . '" target="_parent">' . __('Return to Plugins page') . '</a>',
- 'updates_page' => '<a href="' . admin_url('update-core.php') . '" title="' . esc_attr__('Go to WordPress Updates page') . '" target="_parent">' . __('Return to WordPress Updates') . '</a>'
</del><ins>+ 'plugins_page' => '<a href="' . self_admin_url('plugins.php') . '" title="' . esc_attr__('Go to plugins page') . '" target="_parent">' . __('Return to Plugins page') . '</a>',
+ 'updates_page' => '<a href="' . self_admin_url('update-core.php') . '" title="' . esc_attr__('Go to WordPress Updates page') . '" target="_parent">' . __('Return to WordPress Updates') . '</a>'
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $update_actions = apply_filters('update_bulk_plugins_complete_actions', $update_actions, $this->plugin_info);
</span></span></pre></div>
<a id="trunkwpadminnetworkmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/menu.php (15870 => 15871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/menu.php 2010-10-20 16:09:55 UTC (rev 15870)
+++ trunk/wp-admin/network/menu.php 2010-10-20 16:38:00 UTC (rev 15871)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx"> $menu[10] = array(__('Users'), 'manage_network_users', 'users.php', '', 'menu-top menu-icon-users', 'menu-users', 'div');
</span><span class="cx"> $menu[15] = array(__('Themes'), 'manage_network_themes', 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'div');
</span><span class="cx">
</span><del>-$plugin_update_count = 0;
</del><ins>+$plugin_update_count = $theme_update_count = $wordpress_update_count = 0;
</ins><span class="cx"> $update_plugins = get_site_transient( 'update_plugins' );
</span><span class="cx"> if ( !empty($update_plugins->response) )
</span><span class="cx"> $plugin_update_count = count( $update_plugins->response );
</span><span class="lines">@@ -21,8 +21,31 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> $menu[25] = array(__('Settings'), 'manage_network_options', 'settings.php', '', 'menu-top menu-icon-settings', 'menu-settings', 'div');
</span><del>-$menu[30] = array(__('Update'), 'manage_network', 'upgrade.php', '', 'menu-top menu-icon-tools', 'menu-update', 'div');
</del><span class="cx">
</span><ins>+$update_themes = get_site_transient( 'update_themes' );
+if ( !empty($update_themes->response) )
+ $theme_update_count = count( $update_themes->response );
+$update_wordpress = get_core_updates( array('dismissed' => false) );
+if ( !empty($update_wordpress) && !in_array( $update_wordpress[0]->response, array('development', 'latest') ) )
+ $wordpress_update_count = 1;
+
+$update_count = $plugin_update_count + $theme_update_count + $wordpress_update_count;
+$update_title = array();
+if ( $wordpress_update_count )
+ $update_title[] = sprintf(__('%d WordPress Update'), $wordpress_update_count);
+if ( $plugin_update_count )
+ $update_title[] = sprintf(_n('%d Plugin Update', '%d Plugin Updates', $plugin_update_count), $plugin_update_count);
+if ( $theme_update_count )
+ $update_title[] = sprintf(_n('%d Theme Update', '%d Themes Updates', $theme_update_count), $theme_update_count);
+
+$update_title = !empty($update_title) ? esc_attr(implode(', ', $update_title)) : '';
+
+$menu[30] = array(sprintf( __('Update %s'), "<span class='update-plugins count-$update_count' title='$update_title'><span class='update-count'>" . number_format_i18n($update_count) . "</span></span>" ), 'manage_network', 'upgrade.php', '', 'menu-top menu-icon-tools', 'menu-update', 'div');
+$submenu[ 'upgrade.php' ][10] = array( sprintf( __('Updates %s'), "<span class='update-plugins count-$update_count' title='$update_title'><span class='update-count'>" . number_format_i18n($update_count) . "</span></span>" ), 'install_plugins', 'update-core.php');
+$submenu[ 'upgrade.php' ][15] = array( __( 'Update Network' ), 'manage_network', 'upgrade.php' );
+unset($plugin_update_count, $theme_update_count, $wordpress_update_count, $update_count, $update_title, $update_themes, $update_plugins, $update_wordpress);
+
+
</ins><span class="cx"> $menu[99] = array( '', 'read', 'separator-last', '', 'wp-menu-separator-last' );
</span><span class="cx">
</span><span class="cx"> $submenu['themes.php'][5] = array( __('Themes'), 'manage_network_themes', 'themes.php' );
</span></span></pre></div>
<a id="trunkwpadminupdatecorephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/update-core.php (15870 => 15871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/update-core.php 2010-10-20 16:09:55 UTC (rev 15870)
+++ trunk/wp-admin/update-core.php 2010-10-20 16:38:00 UTC (rev 15871)
</span><span class="lines">@@ -392,7 +392,7 @@
</span><span class="cx">
</span><span class="cx"> if ( 'upgrade-core' == $action ) {
</span><span class="cx"> wp_version_check();
</span><del>- require_once('./admin-header.php');
</del><ins>+ require_once(ABSPATH . 'wp-admin/admin-header.php');
</ins><span class="cx"> core_upgrade_preamble();
</span><span class="cx"> } elseif ( 'do-core-upgrade' == $action || 'do-core-reinstall' == $action ) {
</span><span class="cx"> check_admin_referer('upgrade-core');
</span><span class="lines">@@ -404,7 +404,7 @@
</span><span class="cx"> elseif ( isset( $_POST['undismiss'] ) )
</span><span class="cx"> do_undismiss_core_update();
</span><span class="cx">
</span><del>- require_once('./admin-header.php');
</del><ins>+ require_once(ABSPATH . 'wp-admin/admin-header.php');
</ins><span class="cx"> if ( 'do-core-reinstall' == $action )
</span><span class="cx"> $reinstall = true;
</span><span class="cx"> else
</span><span class="lines">@@ -430,7 +430,7 @@
</span><span class="cx">
</span><span class="cx"> $title = __('Update Plugins');
</span><span class="cx">
</span><del>- require_once('./admin-header.php');
</del><ins>+ require_once(ABSPATH . 'wp-admin/admin-header.php');
</ins><span class="cx"> echo '<div class="wrap">';
</span><span class="cx"> screen_icon('plugins');
</span><span class="cx"> echo '<h2>' . esc_html__('Update Plugins') . '</h2>';
</span><span class="lines">@@ -453,7 +453,7 @@
</span><span class="cx">
</span><span class="cx"> $title = __('Update Themes');
</span><span class="cx">
</span><del>- require_once('./admin-header.php');
</del><ins>+ require_once(ABSPATH . 'wp-admin/admin-header.php');
</ins><span class="cx"> echo '<div class="wrap">';
</span><span class="cx"> screen_icon('themes');
</span><span class="cx"> echo '<h2>' . esc_html__('Update Themes') . '</h2>';
</span><span class="lines">@@ -461,4 +461,4 @@
</span><span class="cx"> echo '</div>';
</span><span class="cx"> }
</span><span class="cx">
</span><del>-include('./admin-footer.php');
</del><ins>+include(ABSPATH . 'wp-admin/admin-footer.php');
</ins></span></pre>
</div>
</div>
</body>
</html>