X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/af50974463450c98503e763a7836a50e260461a9..refs/tags/wordpress-4.5:/wp-admin/includes/update.php
diff --git a/wp-admin/includes/update.php b/wp-admin/includes/update.php
index 502666a5..e412073e 100644
--- a/wp-admin/includes/update.php
+++ b/wp-admin/includes/update.php
@@ -9,7 +9,7 @@
/**
* Selects the first update version from the update_core option.
*
- * @return bool|object The response from the API on success, false on failure.
+ * @return object|array|false The response from the API on success, false on failure.
*/
function get_preferred_from_update_core() {
$updates = get_core_updates();
@@ -24,8 +24,8 @@ 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-dismissed updates.
- * @return bool|array Array of the update objects on success, false on failure.
+ * set $options['available'] to false to skip not-dismissed updates.
+ * @return array|false Array of the update objects on success, false on failure.
*/
function get_core_updates( $options = array() ) {
$options = array_merge( array( 'available' => true, 'dismissed' => false ), $options );
@@ -67,7 +67,7 @@ function get_core_updates( $options = array() ) {
*
* @since 3.7.0
*
- * @return bool|array False on failure, otherwise the core update offering.
+ * @return array|false False on failure, otherwise the core update offering.
*/
function find_core_auto_update() {
$updates = get_site_transient( 'update_core' );
@@ -128,12 +128,23 @@ function get_core_checksums( $version, $locale ) {
return $body['checksums'];
}
+/**
+ *
+ * @param object $update
+ * @return bool
+ */
function dismiss_core_update( $update ) {
$dismissed = get_site_option( 'dismissed_update_core' );
$dismissed[ $update->current . '|' . $update->locale ] = true;
return update_site_option( 'dismissed_update_core', $dismissed );
}
+/**
+ *
+ * @param string $version
+ * @param string $locale
+ * @return bool
+ */
function undismiss_core_update( $version, $locale ) {
$dismissed = get_site_option( 'dismissed_update_core' );
$key = $version . '|' . $locale;
@@ -145,6 +156,12 @@ function undismiss_core_update( $version, $locale ) {
return update_site_option( 'dismissed_update_core', $dismissed );
}
+/**
+ *
+ * @param string $version
+ * @param string $locale
+ * @return object|false
+ */
function find_core_update( $version, $locale ) {
$from_api = get_site_transient( 'update_core' );
@@ -159,6 +176,11 @@ function find_core_update( $version, $locale ) {
return false;
}
+/**
+ *
+ * @param string $msg
+ * @return string
+ */
function core_update_footer( $msg = '' ) {
if ( !current_user_can('update_core') )
return sprintf( __( 'Version %s' ), get_bloginfo( 'version', 'display' ) );
@@ -181,15 +203,19 @@ function core_update_footer( $msg = '' ) {
return sprintf( __( 'You are using a development version (%1$s). Cool! Please stay updated.' ), get_bloginfo( 'version', 'display' ), network_admin_url( 'update-core.php' ) );
case 'upgrade' :
- return sprintf( ''.__( 'Get Version %2$s' ).'', network_admin_url( 'update-core.php' ), $cur->current);
+ return '' . sprintf( __( 'Get Version %s' ), $cur->current ) . '';
case 'latest' :
default :
return sprintf( __( 'Version %s' ), get_bloginfo( 'version', 'display' ) );
}
}
-add_filter( 'update_footer', 'core_update_footer' );
+/**
+ *
+ * @global string $pagenow
+ * @return false|void
+ */
function update_nag() {
if ( is_multisite() && !current_user_can('update_core') )
return false;
@@ -205,14 +231,12 @@ function update_nag() {
return false;
if ( current_user_can('update_core') ) {
- $msg = sprintf( __('WordPress %1$s is available! Please update now.'), $cur->current, network_admin_url( 'update-core.php' ) );
+ $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 );
+ $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 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 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) );
+ if ( is_network_admin() ) {
+ $active_class = is_plugin_active_for_network( $file ) ? ' active': '';
+ } else {
+ $active_class = is_plugin_active( $file ) ? ' active' : '';
+ }
+ echo ' ';
+
+ if ( ! current_user_can( 'update_plugins' ) ) {
+ /* translators: 1: plugin name, 2: details URL, 3: accessibility text, 4: version number */
+ printf( __( 'There is a new version of %1$s available. View version %4$s details.' ),
+ $plugin_name,
+ esc_url( $details_url ),
+ /* translators: 1: plugin name, 2: version number */
+ esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $plugin_name, $r->new_version ) ),
+ $r->new_version
+ );
+ } elseif ( empty( $r->package ) ) {
+ /* translators: 1: plugin name, 2: details URL, 3: accessibility text, 4: version number */
+ 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 ),
+ /* translators: 1: plugin name, 2: version number */
+ esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $plugin_name, $r->new_version ) ),
+ $r->new_version
+ );
+ } else {
+ /* translators: 1: plugin name, 2: details URL, 3: accessibility text, 4: version number, 5: update URL, 6: accessibility text */
+ printf( __( 'There is a new version of %1$s available. View version %4$s details or update now.' ),
+ $plugin_name,
+ esc_url( $details_url ),
+ /* translators: 1: plugin name, 2: version number */
+ esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $plugin_name, $r->new_version ) ),
+ $r->new_version,
+ wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $file, 'upgrade-plugin_' . $file ),
+ /* translators: %s: plugin name */
+ esc_attr( sprintf( __( 'Update %s now' ), $plugin_name ) )
+ );
+ }
/**
* Fires at the end of the update message container in each
* row of the plugins list table.
@@ -326,6 +409,10 @@ function wp_plugin_update_row( $file, $plugin_data ) {
}
}
+/**
+ *
+ * @return array
+ */
function get_theme_updates() {
$current = get_site_transient('update_themes');
@@ -341,6 +428,9 @@ function get_theme_updates() {
return $update_themes;
}
+/**
+ * @since 3.1.0
+ */
function wp_theme_update_rows() {
if ( !current_user_can('update_themes' ) )
return;
@@ -349,31 +439,65 @@ function wp_theme_update_rows() {
if ( isset($themes->response) && is_array($themes->response) ) {
$themes = array_keys( $themes->response );
- foreach( $themes as $theme ) {
+ foreach ( $themes as $theme ) {
add_action( "after_theme_row_$theme", 'wp_theme_update_row', 10, 2 );
}
}
}
-add_action( 'admin_init', 'wp_theme_update_rows' );
+/**
+ *
+ * @param string $theme_key
+ * @param WP_Theme $theme
+ * @return false|void
+ */
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 ];
+ $theme_name = $theme['Name'];
+
$details_url = add_query_arg( array( 'TB_iframe' => 'true', 'width' => 1024, 'height' => 800 ), $current->response[ $theme_key ]['url'] );
$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 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 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) );
-
+ $active = $theme->is_allowed( 'network' ) ? ' active': '';
+
+ echo ' ';
+ if ( ! current_user_can('update_themes') ) {
+ /* translators: 1: theme name, 2: details URL, 3: accessibility text, 4: version number */
+ printf( __( 'There is a new version of %1$s available. View version %4$s details.'),
+ $theme_name,
+ esc_url( $details_url ),
+ /* translators: 1: theme name, 2: version number */
+ esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $theme_name, $r['new_version'] ) ),
+ $r['new_version']
+ );
+ } elseif ( empty( $r['package'] ) ) {
+ /* translators: 1: theme name, 2: details URL, 3: accessibility text, 4: version number */
+ 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 ),
+ /* translators: 1: theme name, 2: version number */
+ esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $theme_name, $r['new_version'] ) ),
+ $r['new_version']
+ );
+ } else {
+ /* translators: 1: theme name, 2: details URL, 3: accessibility text, 4: version number, 5: update URL, 6: accessibility text */
+ printf( __( 'There is a new version of %1$s available. View version %4$s details or update now.' ),
+ $theme_name,
+ esc_url( $details_url ),
+ /* translators: 1: theme name, 2: version number */
+ esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $theme_name, $r['new_version'] ) ),
+ $r['new_version'],
+ wp_nonce_url( self_admin_url( 'update.php?action=upgrade-theme&theme=' ) . $theme_key, 'upgrade-theme_' . $theme_key ),
+ /* translators: %s: theme name */
+ esc_attr( sprintf( __( 'Update %s now' ), $theme_name ) )
+ );
+ }
/**
* Fires at the end of the update message container in each
* row of the themes list table.
@@ -397,6 +521,11 @@ function wp_theme_update_row( $theme_key, $theme ) {
echo ' | ';
}
+/**
+ *
+ * @global int $upgrading
+ * @return false|void
+ */
function maintenance_nag() {
include( ABSPATH . WPINC . '/version.php' ); // include an unmodified $wp_version
global $upgrading;
@@ -428,5 +557,3 @@ function maintenance_nag() {
echo " $msg ";
}
-add_action( 'admin_notices', 'maintenance_nag' );
-add_action( 'network_admin_notices', 'maintenance_nag' );
| | |