WordPress 4.7.2

[autoinstalls/wordpress.git] / wp-includes / update.php

diff --git a/wp-includes/update.php b/wp-includes/update.php
index 3fe0d937289b6a9ffe7954833966ac07f6893ee3..f0b999a4cc5a13a637a0b6de355500371c7d866f 100644 (file)
--- a/wp-includes/update.php
+++ b/wp-includes/update.php
@@ -55,7 +55,7 @@ function wp_version_check( $extra_stats = array(), $force_check = false ) {
        }
 
        /**
-        * Filter the locale requested for WordPress core translations.
+        * Filters the locale requested for WordPress core translations.
         *
         * @since 2.8.0
         *
@@ -120,7 +120,14 @@ function wp_version_check( $extra_stats = array(), $force_check = false ) {
 
        $response = wp_remote_post( $url, $options );
        if ( $ssl && is_wp_error( $response ) ) {
-               trigger_error( __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.' ) . ' ' . __( '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)' ), headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE );
+               trigger_error(
+                       sprintf(
+                               /* translators: %s: support forums URL */
+                               __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.' ),
+                               __( 'https://wordpress.org/support/' )
+                       ) . ' ' . __( '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)' ),
+                       headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE
+               );
                $response = wp_remote_post( $http_url, $options );
        }
 
@@ -265,7 +272,7 @@ function wp_update_plugins( $extra_stats = array() ) {
        $locales = array_values( get_available_languages() );
 
        /**
-        * Filter the locales requested for plugin translations.
+        * Filters the locales requested for plugin translations.
         *
         * @since 3.7.0
         * @since 4.5.0 The default value of the `$locales` parameter changed to include all locales.
@@ -303,7 +310,14 @@ function wp_update_plugins( $extra_stats = array() ) {
 
        $raw_response = wp_remote_post( $url, $options );
        if ( $ssl && is_wp_error( $raw_response ) ) {
-               trigger_error( __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.' ) . ' ' . __( '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)' ), headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE );
+               trigger_error(
+                       sprintf(
+                               /* translators: %s: support forums URL */
+                               __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.' ),
+                               __( 'https://wordpress.org/support/' )
+                       ) . ' ' . __( '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)' ),
+                       headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE
+               );
                $raw_response = wp_remote_post( $http_url, $options );
        }
 
@@ -439,7 +453,7 @@ function wp_update_themes( $extra_stats = array() ) {
        $locales = array_values( get_available_languages() );
 
        /**
-        * Filter the locales requested for theme translations.
+        * Filters the locales requested for theme translations.
         *
         * @since 3.7.0
         * @since 4.5.0 The default value of the `$locales` parameter changed to include all locales.
@@ -476,7 +490,14 @@ function wp_update_themes( $extra_stats = array() ) {
 
        $raw_response = wp_remote_post( $url, $options );
        if ( $ssl && is_wp_error( $raw_response ) ) {
-               trigger_error( __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.' ) . ' ' . __( '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)' ), headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE );
+               trigger_error(
+                       sprintf(
+                               /* translators: %s: support forums URL */
+                               __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.' ),
+                               __( 'https://wordpress.org/support/' )
+                       ) . ' ' . __( '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)' ),
+                       headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE
+               );
                $raw_response = wp_remote_post( $http_url, $options );
        }
 
@@ -566,20 +587,27 @@ function wp_get_update_data() {
 
        $counts['total'] = $counts['plugins'] + $counts['themes'] + $counts['wordpress'] + $counts['translations'];
        $titles = array();
-       if ( $counts['wordpress'] )
+       if ( $counts['wordpress'] ) {
+               /* translators: 1: Number of updates available to WordPress */
                $titles['wordpress'] = sprintf( __( '%d WordPress Update'), $counts['wordpress'] );
-       if ( $counts['plugins'] )
+       }
+       if ( $counts['plugins'] ) {
+               /* translators: 1: Number of updates available to plugins */
                $titles['plugins'] = sprintf( _n( '%d Plugin Update', '%d Plugin Updates', $counts['plugins'] ), $counts['plugins'] );
-       if ( $counts['themes'] )
+       }
+       if ( $counts['themes'] ) {
+               /* translators: 1: Number of updates available to themes */
                $titles['themes'] = sprintf( _n( '%d Theme Update', '%d Theme Updates', $counts['themes'] ), $counts['themes'] );
-       if ( $counts['translations'] )
+       }
+       if ( $counts['translations'] ) {
                $titles['translations'] = __( 'Translation Updates' );
+       }
 
        $update_title = $titles ? esc_attr( implode( ', ', $titles ) ) : '';
 
        $update_data = array( 'counts' => $counts, 'title' => $update_title );
        /**
-        * Filter the returned array of update data for plugins, themes, and WordPress core.
+        * Filters the returned array of update data for plugins, themes, and WordPress core.
         *
         * @since 3.5.0
         *
@@ -678,27 +706,24 @@ function wp_clean_update_cache() {
        delete_site_transient( 'update_core' );
 }
 
-if ( ( ! is_main_site() && ! is_network_admin() ) || ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
+if ( ( ! is_main_site() && ! is_network_admin() ) || wp_doing_ajax() ) {
        return;
 }
 
 add_action( 'admin_init', '_maybe_update_core' );
 add_action( 'wp_version_check', 'wp_version_check' );
-add_action( 'upgrader_process_complete', 'wp_version_check', 10, 0 );
 
 add_action( 'load-plugins.php', 'wp_update_plugins' );
 add_action( 'load-update.php', 'wp_update_plugins' );
 add_action( 'load-update-core.php', 'wp_update_plugins' );
 add_action( 'admin_init', '_maybe_update_plugins' );
 add_action( 'wp_update_plugins', 'wp_update_plugins' );
-add_action( 'upgrader_process_complete', 'wp_update_plugins', 10, 0 );
 
 add_action( 'load-themes.php', 'wp_update_themes' );
 add_action( 'load-update.php', 'wp_update_themes' );
 add_action( 'load-update-core.php', 'wp_update_themes' );
 add_action( 'admin_init', '_maybe_update_themes' );
 add_action( 'wp_update_themes', 'wp_update_themes' );
-add_action( 'upgrader_process_complete', 'wp_update_themes', 10, 0 );
 
 add_action( 'update_option_WPLANG', 'wp_clean_update_cache' , 10, 0 );