X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/a5227bf01edbe6660486c9f5c0f0ed7b7fea3130..refs/tags/wordpress-3.1:/wp-admin/includes/update.php
diff --git a/wp-admin/includes/update.php b/wp-admin/includes/update.php
index 52e9ee1a..06e06c24 100644
--- a/wp-admin/includes/update.php
+++ b/wp-admin/includes/update.php
@@ -100,11 +100,11 @@ function core_update_footer( $msg = '' ) {
switch ( $cur->response ) {
case 'development' :
- return sprintf( __( 'You are using a development version (%1$s). Cool! Please stay updated.' ), $GLOBALS['wp_version'], 'update-core.php');
+ return sprintf( __( 'You are using a development version (%1$s). Cool! Please stay updated.' ), $GLOBALS['wp_version'], network_admin_url( 'update-core.php' ) );
break;
case 'upgrade' :
- return sprintf( ''.__( 'Get Version %2$s' ).'', 'update-core.php', $cur->current);
+ return sprintf( ''.__( 'Get Version %2$s' ).'', network_admin_url( 'update-core.php' ), $cur->current);
break;
case 'latest' :
@@ -129,11 +129,11 @@ function update_nag() {
if ( ! isset( $cur->response ) || $cur->response != 'upgrade' )
return false;
- if ( current_user_can('update_core') )
- $msg = sprintf( __('WordPress %1$s is available! Please update now.'), $cur->current, 'update-core.php' );
- else
+ if ( current_user_can('update_core') ) {
+ $msg = sprintf( __('WordPress %1$s is available! Please update now.'), $cur->current, network_admin_url( 'update-core.php' ) );
+ } else {
$msg = sprintf( __('WordPress %1$s is available! Please notify the site administrator.'), $cur->current );
-
+ }
echo "
';
- if ( ! current_user_can('update_plugins') )
- printf( __('There is a new version of %1$s available. View version %4$s Details.'), $plugin_name, esc_url($details_url), esc_attr($plugin_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 upgrade 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 upgrade automatically.'), $plugin_name, esc_url($details_url), esc_attr($plugin_name), $r->new_version, wp_nonce_url('update.php?action=upgrade-plugin&plugin=' . $file, 'upgrade-plugin_' . $file) );
+ $wp_list_table = _get_list_table('WP_Plugins_List_Table');
+
+ if ( is_network_admin() || !is_multisite() ) {
+ echo ' ';
+ if ( ! current_user_can('update_plugins') )
+ printf( __('There is a new version of %1$s available. View version %4$s details.'), $plugin_name, esc_url($details_url), esc_attr($plugin_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.'), $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) );
+ }
do_action( "in_plugin_update_message-$file", $plugin_data, $r );
@@ -239,6 +245,45 @@ function wp_update_theme($theme, $feedback = '') {
return $upgrader->upgrade($theme);
}
+function wp_theme_update_rows() {
+ if ( !current_user_can('update_themes' ) )
+ return;
+
+ $themes = get_site_transient( 'update_themes' );
+ if ( isset($themes->response) && is_array($themes->response) ) {
+ $themes = array_keys( $themes->response );
+
+ foreach( $themes as $theme ) {
+ add_action( "after_theme_row_$theme", 'wp_theme_update_row', 10, 2 );
+ }
+ }
+}
+add_action( 'admin_init', 'wp_theme_update_rows' );
+
+function wp_theme_update_row( $theme_key, $theme ) {
+ $current = get_site_transient( 'update_themes' );
+ if ( !isset( $current->response[ $theme_key ] ) )
+ return false;
+ $r = $current->response[ $theme_key ];
+ $themes_allowedtags = array('a' => array('href' => array(),'title' => array()),'abbr' => array('title' => array()),'acronym' => array('title' => array()),'code' => array(),'em' => array(),'strong' => array());
+ $theme_name = wp_kses( $theme['Name'], $themes_allowedtags );
+
+ $details_url = self_admin_url("theme-install.php?tab=theme-information&theme=$theme_key&TB_iframe=true&width=600&height=400");
+
+ $wp_list_table = _get_list_table('WP_MS_Themes_List_Table');
+
+ echo ' ';
+ 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'] );
+ 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) );
+
+ do_action( "in_theme_update_message-$theme_key", $theme, $r );
+
+ echo ' | ';
+}
function wp_update_core($current, $feedback = '') {
if ( !empty($feedback) )
| |