<!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" />
<title>[18468] trunk: Consolidate update count code into wp_get_update_data().</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/18468">18468</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-07-26 18:39:57 +0000 (Tue, 26 Jul 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Consolidate update count code into wp_get_update_data(). Props mitchoyoshitaka. fixes <a href="http://core.trac.wordpress.org/ticket/17694">#17694</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminmenuphp">trunk/wp-admin/menu.php</a></li>
<li><a href="#trunkwpadminnetworkmenuphp">trunk/wp-admin/network/menu.php</a></li>
<li><a href="#trunkwpincludesadminbarphp">trunk/wp-includes/admin-bar.php</a></li>
<li><a href="#trunkwpincludesupdatephp">trunk/wp-includes/update.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/menu.php (18467 => 18468)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/menu.php 2011-07-25 20:20:07 UTC (rev 18467)
+++ trunk/wp-admin/menu.php 2011-07-26 18:39:57 UTC (rev 18468)
</span><span class="lines">@@ -30,45 +30,13 @@
</span><span class="cx"> $submenu[ 'index.php' ][5] = array( __('My Sites'), 'read', 'my-sites.php' );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-if ( ! is_multisite() || is_super_admin() ) {
- $plugin_update_count = $theme_update_count = $wordpress_update_count = 0;
</del><ins>+if ( ! is_multisite() || is_super_admin() )
+ $update_data = wp_get_update_data();
</ins><span class="cx">
</span><del>- if ( current_user_can( 'update_plugins' ) ) {
- $update_plugins = get_site_transient( 'update_plugins' );
- if ( ! empty( $update_plugins->response ) )
- $plugin_update_count = count( $update_plugins->response );
- }
-
- if ( current_user_can( 'update_themes' ) ) {
- $update_themes = get_site_transient( 'update_themes' );
- if ( !empty($update_themes->response) )
- $theme_update_count = count( $update_themes->response );
- }
-
- if ( current_user_can( 'update_core' ) ) {
- $update_wordpress = get_core_updates( array('dismissed' => false) );
- if ( !empty($update_wordpress) && !in_array( $update_wordpress[0]->response, array('development', 'latest') ) && current_user_can('update_core') )
- $wordpress_update_count = 1;
- }
-
- $total_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 Theme Updates', $theme_update_count), $theme_update_count);
-
- $update_title = !empty($update_title) ? esc_attr(implode(', ', $update_title)) : '';
-}
-
</del><span class="cx"> if ( ! is_multisite() ) {
</span><del>- $submenu[ 'index.php' ][10] = array( sprintf( __('Updates %s'), "<span class='update-plugins count-$total_update_count' title='$update_title'><span class='update-count'>" . number_format_i18n($total_update_count) . "</span></span>" ), 'update_core', 'update-core.php');
</del><ins>+ $submenu[ 'index.php' ][10] = array( sprintf( __('Updates %s'), "<span class='update-plugins count-{$update_data['counts']['total']}' title='{$update_data['title']}'><span class='update-count'>" . number_format_i18n($update_data['counts']['total']) . "</span></span>" ), 'update_core', 'update-core.php');
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-unset($theme_update_count, $wordpress_update_count, $update_themes, $update_plugins, $update_wordpress);
-
</del><span class="cx"> $menu[4] = array( '', 'read', 'separator1', '', 'wp-menu-separator' );
</span><span class="cx">
</span><span class="cx"> $menu[5] = array( __('Posts'), 'edit_posts', 'edit.php', '', 'open-if-no-js menu-top menu-icon-post', 'menu-posts', 'div' );
</span><span class="lines">@@ -176,9 +144,12 @@
</span><span class="cx">
</span><span class="cx"> $menu_perms = get_site_option( 'menu_items', array() );
</span><span class="cx"> if ( ! is_multisite() || is_super_admin() || ! empty( $menu_perms['plugins'] ) ) {
</span><ins>+ if ( ! isset( $update_data ) )
+ $update_data = wp_get_update_data();
+
</ins><span class="cx"> $count = '';
</span><span class="cx"> if ( ! is_multisite() && current_user_can( 'update_plugins' ) )
</span><del>- $count = "<span class='update-plugins count-$plugin_update_count'><span class='plugin-count'>" . number_format_i18n($plugin_update_count) . "</span></span>";
</del><ins>+ $count = "<span class='update-plugins count-{$update_data['counts']['plugins']}'><span class='plugin-count'>" . number_format_i18n($update_data['counts']['plugins']) . "</span></span>";
</ins><span class="cx">
</span><span class="cx"> $menu[65] = array( sprintf( __('Plugins %s'), $count ), 'activate_plugins', 'plugins.php', '', 'menu-top menu-icon-plugins', 'menu-plugins', 'div' );
</span><span class="cx">
</span><span class="lines">@@ -190,7 +161,7 @@
</span><span class="cx"> $submenu['plugins.php'][15] = array( _x('Editor', 'plugin editor'), 'edit_plugins', 'plugin-editor.php' );
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-unset($menu_perms, $update_plugins, $plugin_update_count);
</del><ins>+unset($menu_perms, $update_data);
</ins><span class="cx">
</span><span class="cx"> if ( current_user_can('list_users') )
</span><span class="cx"> $menu[70] = array( __('Users'), 'list_users', 'users.php', '', 'menu-top menu-icon-users', 'menu-users', 'div' );
</span></span></pre></div>
<a id="trunkwpadminnetworkmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/menu.php (18467 => 18468)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/menu.php 2011-07-25 20:20:07 UTC (rev 18467)
+++ trunk/wp-admin/network/menu.php 2011-07-26 18:39:57 UTC (rev 18468)
</span><span class="lines">@@ -21,12 +21,10 @@
</span><span class="cx"> $submenu['users.php'][5] = array( __('All Users'), 'manage_network_users', 'users.php' );
</span><span class="cx"> $submenu['users.php'][10] = array( _x('Add New', 'user'), 'create_users', 'user-new.php' );
</span><span class="cx">
</span><del>-if ( current_user_can( 'update_themes' ) ) {
- $plugin_update_count = $theme_update_count = $wordpress_update_count = 0;
- $update_themes = get_site_transient( 'update_themes' );
- if ( !empty($update_themes->response) )
- $theme_update_count = count( $update_themes->response );
- $menu[15] = array(sprintf( __( 'Themes %s' ), "<span class='update-plugins count-$theme_update_count'><span class='theme-count'>" . number_format_i18n( $theme_update_count ) . "</span></span>" ), 'manage_network_themes', 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'div' );
</del><ins>+$update_data = wp_get_update_data();
+
+if ( $update_data['counts']['themes'] ) {
+ $menu[15] = array(sprintf( __( 'Themes %s' ), "<span class='update-plugins count-{$update_data['counts']['themes']}'><span class='theme-count'>" . number_format_i18n( $update_data['counts']['themes'] ) . "</span></span>" ), 'manage_network_themes', 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'div' );
</ins><span class="cx"> } else {
</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><span class="lines">@@ -35,10 +33,7 @@
</span><span class="cx"> $submenu['themes.php'][15] = array( _x('Editor', 'theme editor'), 'edit_themes', 'theme-editor.php' );
</span><span class="cx">
</span><span class="cx"> if ( current_user_can( 'update_plugins' ) ) {
</span><del>- $update_plugins = get_site_transient( 'update_plugins' );
- if ( !empty($update_plugins->response) )
- $plugin_update_count = count( $update_plugins->response );
- $menu[20] = array( sprintf( __( 'Plugins %s' ), "<span class='update-plugins count-$plugin_update_count'><span class='plugin-count'>" . number_format_i18n( $plugin_update_count ) . "</span></span>" ), 'manage_network_plugins', 'plugins.php', '', 'menu-top menu-icon-plugins', 'menu-plugins', 'div');
</del><ins>+ $menu[20] = array( sprintf( __( 'Plugins %s' ), "<span class='update-plugins count-{$update_data['counts']['plugins']}'><span class='plugin-count'>" . number_format_i18n( $update_data['counts']['plugins'] ) . "</span></span>" ), 'manage_network_plugins', 'plugins.php', '', 'menu-top menu-icon-plugins', 'menu-plugins', 'div');
</ins><span class="cx"> } else {
</span><span class="cx"> $menu[20] = array( __('Plugins'), 'manage_network_plugins', 'plugins.php', '', 'menu-top menu-icon-plugins', 'menu-plugins', 'div' );
</span><span class="cx"> }
</span><span class="lines">@@ -53,32 +48,17 @@
</span><span class="cx"> $submenu['settings.php'][10] = array( __('Network Setup'), 'manage_network_options', 'setup.php' );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-if ( current_user_can( 'update_core' ) ) {
- $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 Theme Updates', $theme_update_count), $theme_update_count);
-
- $update_title = !empty($update_title) ? esc_attr(implode(', ', $update_title)) : '';
-
- $menu[30] = 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>" ), 'manage_network', 'upgrade.php', '', 'menu-top menu-icon-tools', 'menu-update', 'div' );
</del><ins>+if ( $update_data['counts']['total'] ) {
+ $menu[30] = array( sprintf( __( 'Updates %s' ), "<span class='update-plugins count-{$update_data['counts']['total']}' title='{$update_data['title']}'><span class='update-count'>" . number_format_i18n($update_data['counts']['total']) . "</span></span>" ), 'manage_network', 'upgrade.php', '', 'menu-top menu-icon-tools', 'menu-update', 'div' );
</ins><span class="cx"> } else {
</span><span class="cx"> $menu[30] = array( __( 'Updates' ), 'manage_network', 'upgrade.php', '', 'menu-top menu-icon-tools', 'menu-update', 'div' );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+unset($update_data);
+
</ins><span class="cx"> $submenu[ 'upgrade.php' ][10] = array( __( 'Available Updates' ), 'update_core', 'update-core.php' );
</span><span class="cx"> $submenu[ 'upgrade.php' ][15] = array( __( 'Update Network' ), 'manage_network', 'upgrade.php' );
</span><del>-unset($plugin_update_count, $theme_update_count, $wordpress_update_count, $update_count, $update_title, $update_themes, $update_plugins, $update_wordpress);
</del><span class="cx">
</span><del>-
</del><span class="cx"> $menu[99] = array( '', 'read', 'separator-last', '', 'wp-menu-separator-last' );
</span><span class="cx">
</span><span class="cx"> require_once(ABSPATH . 'wp-admin/includes/menu.php');
</span></span></pre></div>
<a id="trunkwpincludesadminbarphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/admin-bar.php (18467 => 18468)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/admin-bar.php 2011-07-25 20:20:07 UTC (rev 18467)
+++ trunk/wp-includes/admin-bar.php 2011-07-26 18:39:57 UTC (rev 18468)
</span><span class="lines">@@ -323,39 +323,14 @@
</span><span class="cx"> * @since 3.1.0
</span><span class="cx"> */
</span><span class="cx"> function wp_admin_bar_updates_menu( $wp_admin_bar ) {
</span><del>- if ( !current_user_can('install_plugins') )
- return;
</del><span class="cx">
</span><del>- $plugin_update_count = $theme_update_count = $wordpress_update_count = 0;
- $update_plugins = get_site_transient( 'update_plugins' );
- if ( !empty($update_plugins->response) )
- $plugin_update_count = count( $update_plugins->response );
- $update_themes = get_site_transient( 'update_themes' );
- if ( !empty($update_themes->response) )
- $theme_update_count = count( $update_themes->response );
- /* @todo get_core_updates() is only available on admin page loads
- $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;
- */
</del><ins>+ $update_data = wp_get_update_data();
</ins><span class="cx">
</span><del>- $update_count = $plugin_update_count + $theme_update_count + $wordpress_update_count;
-
- if ( !$update_count )
</del><ins>+ if ( !$update_data['counts']['total'] )
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- $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 Theme Updates', $theme_update_count), $theme_update_count);
-
- $update_title = !empty($update_title) ? esc_attr(implode(', ', $update_title)) : '';
-
- $update_title = "<span title='$update_title'>";
- $update_title .= sprintf( __('Updates %s'), "<span id='ab-updates' class='update-count'>" . number_format_i18n($update_count) . '</span>' );
</del><ins>+ $update_title = "<span title='{$update_data['title']}'>";
+ $update_title .= sprintf( __('Updates %s'), "<span id='ab-updates' class='update-count'>" . number_format_i18n($update_data['counts']['total']) . '</span>' );
</ins><span class="cx"> $update_title .= '</span>';
</span><span class="cx">
</span><span class="cx"> $wp_admin_bar->add_menu( array( 'id' => 'updates', 'title' => $update_title, 'href' => network_admin_url( 'update-core.php' ) ) );
</span></span></pre></div>
<a id="trunkwpincludesupdatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/update.php (18467 => 18468)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/update.php 2011-07-25 20:20:07 UTC (rev 18467)
+++ trunk/wp-includes/update.php 2011-07-26 18:39:57 UTC (rev 18468)
</span><span class="lines">@@ -280,6 +280,48 @@
</span><span class="cx"> set_site_transient( 'update_themes', $new_update );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/*
+ * Collect counts and UI strings for available updates
+ *
+ * @since 3.3.0
+ *
+ * @return array
+ */
+function wp_get_update_data() {
+ $counts = array( 'plugins' => 0, 'themes' => 0, 'wordpress' => 0 );
+
+ if ( current_user_can( 'update_plugins' ) ) {
+ $update_plugins = get_site_transient( 'update_plugins' );
+ if ( ! empty( $update_plugins->response ) )
+ $counts['plugins'] = count( $update_plugins->response );
+ }
+
+ if ( current_user_can( 'update_themes' ) ) {
+ $update_themes = get_site_transient( 'update_themes' );
+ if ( ! empty( $update_themes->response ) )
+ $counts['themes'] = count( $update_themes->response );
+ }
+
+ if ( function_exists( 'get_core_updates' ) && current_user_can( 'update_core' ) ) {
+ $update_wordpress = get_core_updates( array('dismissed' => false) );
+ if ( ! empty( $update_wordpress ) && ! in_array( $update_wordpress[0]->response, array('development', 'latest') ) && current_user_can('update_core') )
+ $counts['wordpress'] = 1;
+ }
+
+ $counts['total'] = $counts['plugins'] + $counts['themes'] + $counts['wordpress'];
+ $update_title = array();
+ if ( $counts['wordpress'] )
+ $update_title[] = sprintf(__('%d WordPress Update'), $counts['wordpress']);
+ if ( $counts['plugins'] )
+ $update_title[] = sprintf(_n('%d Plugin Update', '%d Plugin Updates', $counts['plugins']), $counts['plugins']);
+ if ( $counts['themes'] )
+ $update_title[] = sprintf(_n('%d Theme Update', '%d Theme Updates', $counts['themes']), $counts['themes']);
+
+ $update_title = ! empty( $update_title ) ? esc_attr( implode( ', ', $update_title ) ) : '';
+
+ return array( 'counts' => $counts, 'title' => $update_title );
+}
+
</ins><span class="cx"> function _maybe_update_core() {
</span><span class="cx"> include ABSPATH . WPINC . '/version.php'; // include an unmodified $wp_version
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>