Changeset 15871

Timestamp:

10/20/2010 04:38:00 PM (14 years ago)

Author:

ryan

Message:

Add update-core to network admin. Props PeteMall. see #15162

Location:

trunk/wp-admin

Files:

• includes/class-wp-upgrader.php (modified) (2 diffs)
• network/menu.php (modified) (2 diffs)
• update-core.php (modified) (5 diffs)

trunk/wp-admin/includes/class-wp-upgrader.php

@@ -1038 +1038 @@
         $update_actions =  array(
             '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>',
-            'plugins_page' => '<a href="' . admin_url('plugins.php') . '" title="' . esc_attr__('Go to plugins page') . '" target="_parent">' . __('Return to Plugins page') . '</a>'
+            'plugins_page' => '<a href="' . self_admin_url('plugins.php') . '" title="' . esc_attr__('Go to plugins page') . '" target="_parent">' . __('Return to Plugins page') . '</a>'
         );
         if ( $this->plugin_active )
@@ -1196 +1196 @@
         parent::bulk_footer();
         $update_actions =  array(
-            '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>'
+            '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>'
         );
 

trunk/wp-admin/network/menu.php

@@ -11 +11 @@
 $menu[15] = array(__('Themes'), 'manage_network_themes', 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'div');
 
-$plugin_update_count = 0; 
+$plugin_update_count = $theme_update_count = $wordpress_update_count = 0;
 $update_plugins = get_site_transient( 'update_plugins' ); 
 if ( !empty($update_plugins->response) ) 
@@ -22 +22 @@
 
 $menu[25] = array(__('Settings'), 'manage_network_options', 'settings.php', '', 'menu-top menu-icon-settings', 'menu-settings', 'div');
-$menu[30] = array(__('Update'), 'manage_network', 'upgrade.php', '', 'menu-top menu-icon-tools', 'menu-update', 'div');
+
+$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);
+
 
 $menu[99] = array( '', 'read', 'separator-last', '', 'wp-menu-separator-last' );

trunk/wp-admin/update-core.php

@@ -393 +393 @@
 if ( 'upgrade-core' == $action ) {
     wp_version_check();
-    require_once('./admin-header.php');
+    require_once(ABSPATH . 'wp-admin/admin-header.php');
     core_upgrade_preamble();
 } elseif ( 'do-core-upgrade' == $action || 'do-core-reinstall' == $action ) {
@@ -405 +405 @@
         do_undismiss_core_update();
 
-    require_once('./admin-header.php');
+    require_once(ABSPATH . 'wp-admin/admin-header.php');
     if ( 'do-core-reinstall' == $action )
         $reinstall = true;
@@ -431 +431 @@
     $title = __('Update Plugins');
 
-    require_once('./admin-header.php');
+    require_once(ABSPATH . 'wp-admin/admin-header.php');
     echo '<div class="wrap">';
     screen_icon('plugins');
@@ -454 +454 @@
     $title = __('Update Themes');
 
-    require_once('./admin-header.php');
+    require_once(ABSPATH . 'wp-admin/admin-header.php');
     echo '<div class="wrap">';
     screen_icon('themes');
@@ -462 +462 @@
 }
 
-include('./admin-footer.php');
+include(ABSPATH . 'wp-admin/admin-footer.php');