X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/38ca813a0e312e2768e5b9519f0415cd0aa84781..refs/tags/wordpress-3.4:/wp-admin/includes/update.php
diff --git a/wp-admin/includes/update.php b/wp-admin/includes/update.php
index 202f7c45..ff787167 100644
--- a/wp-admin/includes/update.php
+++ b/wp-admin/includes/update.php
@@ -26,7 +26,7 @@ function get_preferred_from_update_core() {
* Get available core updates
*
* @param array $options Set $options['dismissed'] to true to show dismissed upgrades too,
- * set $options['available'] to false to skip not-dimissed updates.
+ * set $options['available'] to false to skip not-dismissed updates.
* @return array Array of the update objects
*/
function get_core_updates( $options = array() ) {
@@ -82,9 +82,6 @@ function find_core_update( $version, $locale ) {
}
function core_update_footer( $msg = '' ) {
- if ( is_multisite() && !current_user_can('update_core') )
- return false;
-
if ( !current_user_can('update_core') )
return sprintf( __( 'Version %s' ), $GLOBALS['wp_version'] );
@@ -140,15 +137,13 @@ add_action( 'admin_notices', 'update_nag', 3 );
// Called directly from dashboard
function update_right_now_message() {
- if ( is_multisite() && !current_user_can('update_core') )
- return false;
-
- $cur = get_preferred_from_update_core();
-
$msg = sprintf( __('You are using WordPress %s.'), $GLOBALS['wp_version'] );
- if ( isset( $cur->response ) && $cur->response == 'upgrade' && current_user_can('update_core') ) {
- $msg .= " " . sprintf( __('Update to %s'), $cur->current ? $cur->current : __( 'Latest' ) ) . '';
+ if ( current_user_can('update_core') ) {
+ $cur = get_preferred_from_update_core();
+
+ if ( isset( $cur->response ) && $cur->response == 'upgrade' )
+ $msg .= " " . sprintf( __('Update to %s'), $cur->current ? $cur->current : __( 'Latest' ) ) . '';
}
echo "$msg";
@@ -192,7 +187,7 @@ function wp_plugin_update_row( $file, $plugin_data ) {
$plugins_allowedtags = array('a' => array('href' => array(),'title' => array()),'abbr' => array('title' => array()),'acronym' => array('title' => array()),'code' => array(),'em' => array(),'strong' => array());
$plugin_name = wp_kses( $plugin_data['Name'], $plugins_allowedtags );
- $details_url = self_admin_url('plugin-install.php?tab=plugin-information&plugin=' . $r->slug . '&TB_iframe=true&width=600&height=800');
+ $details_url = self_admin_url('plugin-install.php?tab=plugin-information&plugin=' . $r->slug . '§ion=changelog&TB_iframe=true&width=600&height=800');
$wp_list_table = _get_list_table('WP_Plugins_List_Table');
@@ -204,7 +199,7 @@ function wp_plugin_update_row( $file, $plugin_data ) {
else if ( empty($r->package) )
printf( __('There is a new version of %1$s available. View version %4$s details. Automatic update is unavailable for this plugin.'), $plugin_name, esc_url($details_url), esc_attr($plugin_name), $r->new_version );
else
- printf( __('There is a new version of %1$s available. View version %4$s details or update automatically.'), $plugin_name, esc_url($details_url), esc_attr($plugin_name), $r->new_version, wp_nonce_url( self_admin_url('update.php?action=upgrade-plugin&plugin=') . $file, 'upgrade-plugin_' . $file) );
+ printf( __('There is a new version of %1$s available. View version %4$s details or update now.'), $plugin_name, esc_url($details_url), esc_attr($plugin_name), $r->new_version, wp_nonce_url( self_admin_url('update.php?action=upgrade-plugin&plugin=') . $file, 'upgrade-plugin_' . $file) );
do_action( "in_plugin_update_message-$file", $plugin_data, $r );
@@ -222,16 +217,16 @@ function wp_update_plugin($plugin, $feedback = '') {
}
function get_theme_updates() {
- $themes = get_themes();
+ $themes = wp_get_themes();
$current = get_site_transient('update_themes');
- $update_themes = array();
- foreach ( $themes as $theme ) {
- $theme = (object) $theme;
- if ( isset($current->response[ $theme->Stylesheet ]) ) {
- $update_themes[$theme->Stylesheet] = $theme;
- $update_themes[$theme->Stylesheet]->update = $current->response[ $theme->Stylesheet ];
- }
+ if ( ! isset( $current->response ) )
+ return array();
+
+ $update_themes = array();
+ foreach ( $current->response as $stylesheet => $data ) {
+ $update_themes[ $stylesheet ] = wp_get_theme( $stylesheet );
+ $update_themes[ $stylesheet ]->update = $data;
}
return $update_themes;
@@ -277,9 +272,9 @@ function wp_theme_update_row( $theme_key, $theme ) {
if ( ! current_user_can('update_themes') )
printf( __('There is a new version of %1$s available. View version %4$s details.'), $theme['Name'], esc_url($details_url), esc_attr($theme['Name']), $r->new_version );
else if ( empty( $r['package'] ) )
- printf( __('There is a new version of %1$s available. View version %4$s details. Automatic update is unavailable for this plugin.'), $theme['Name'], esc_url($details_url), esc_attr($theme['Name']), $r['new_version'] );
+ printf( __('There is a new version of %1$s available. View version %4$s details. Automatic update is unavailable for this theme.'), $theme['Name'], esc_url($details_url), esc_attr($theme['Name']), $r['new_version'] );
else
- printf( __('There is a new version of %1$s available. View version %4$s details or update automatically.'), $theme['Name'], esc_url($details_url), esc_attr($theme['Name']), $r['new_version'], wp_nonce_url( self_admin_url('update.php?action=upgrade-theme&theme=') . $theme_key, 'upgrade-theme_' . $theme_key) );
+ printf( __('There is a new version of %1$s available. View version %4$s details or update now.'), $theme['Name'], esc_url($details_url), esc_attr($theme['Name']), $r['new_version'], wp_nonce_url( self_admin_url('update.php?action=upgrade-theme&theme=') . $theme_key, 'upgrade-theme_' . $theme_key) );
do_action( "in_theme_update_message-$theme_key", $theme, $r );
@@ -309,5 +304,3 @@ function maintenance_nag() {
echo "$msg
";
}
add_action( 'admin_notices', 'maintenance_nag' );
-
-?>