WordPress 4.2.3

[autoinstalls/wordpress.git] / wp-admin / update-core.php

diff --git a/wp-admin/update-core.php b/wp-admin/update-core.php
index 7c939e71f0ccb2209cf15737bd91f8235e034661..a8eb7f51e0675b86b49ce6777d8ff876532695aa 100644 (file)
--- a/wp-admin/update-core.php
+++ b/wp-admin/update-core.php
@@ -58,13 +58,13 @@ function list_core_update( $update ) {
                                $mysql_compat = version_compare( $mysql_version, $update->mysql_version, '>=' );
 
                        if ( !$mysql_compat && !$php_compat )
                                $mysql_compat = version_compare( $mysql_version, $update->mysql_version, '>=' );
 
                        if ( !$mysql_compat && !$php_compat )

-                               $message = sprintf( __('You cannot update because <a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.'), $update->current, $update->php_version, $update->mysql_version, $php_version, $mysql_version );
+                               $message = sprintf( __('You cannot update because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.'), $update->current, $update->php_version, $update->mysql_version, $php_version, $mysql_version );

                        elseif ( !$php_compat )
                        elseif ( !$php_compat )

-                               $message = sprintf( __('You cannot update because <a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher. You are running version %3$s.'), $update->current, $update->php_version, $php_version );
+                               $message = sprintf( __('You cannot update because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher. You are running version %3$s.'), $update->current, $update->php_version, $php_version );

                        elseif ( !$mysql_compat )
                        elseif ( !$mysql_compat )

-                               $message = sprintf( __('You cannot update because <a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires MySQL version %2$s or higher. You are running version %3$s.'), $update->current, $update->mysql_version, $mysql_version );
+                               $message = sprintf( __('You cannot update because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires MySQL version %2$s or higher. You are running version %3$s.'), $update->current, $update->mysql_version, $mysql_version );

                        else
                        else

-                               $message =      sprintf(__('You can update to <a href="http://codex.wordpress.org/Version_%1$s">WordPress %2$s</a> automatically or download the package and install it manually:'), $update->current, $version_string);
+                               $message =      sprintf(__('You can update to <a href="https://codex.wordpress.org/Version_%1$s">WordPress %2$s</a> automatically or download the package and install it manually:'), $update->current, $version_string);

                        if ( !$mysql_compat || !$php_compat )
                                $show_buttons = false;
                }
                        if ( !$mysql_compat || !$php_compat )
                                $show_buttons = false;
                }


@@ -163,7 +163,7 @@ function core_upgrade_preamble() {
                echo '</h3>';
        } else {
                echo '<div class="updated inline"><p>';
                echo '</h3>';
        } else {
                echo '<div class="updated inline"><p>';

-               _e('<strong>Important:</strong> before updating, please <a href="http://codex.wordpress.org/WordPress_Backups">back up your database and files</a>. For help with updates, visit the <a href="http://codex.wordpress.org/Updating_WordPress">Updating WordPress</a> Codex page.');
+               _e('<strong>Important:</strong> before updating, please <a href="https://codex.wordpress.org/WordPress_Backups">back up your database and files</a>. For help with updates, visit the <a href="https://codex.wordpress.org/Updating_WordPress">Updating WordPress</a> Codex page.');

                echo '</p></div>';
 
                echo '<h3 class="response">';
                echo '</p></div>';
 
                echo '<h3 class="response">';


@@ -231,18 +231,12 @@ function list_plugin_updates() {
        </tr>
        </thead>
 
        </tr>
        </thead>
 

-       <tfoot>
-       <tr>
-               <th scope="col" class="manage-column check-column"><input type="checkbox" id="plugins-select-all-2" /></th>
-               <th scope="col" class="manage-column"><label for="plugins-select-all-2"><?php _e('Select All'); ?></label></th>
-       </tr>
-       </tfoot>

        <tbody class="plugins">
 <?php
        foreach ( (array) $plugins as $plugin_file => $plugin_data) {
                $info = plugins_api('plugin_information', array('slug' => $plugin_data->update->slug ));
                if ( is_wp_error( $info ) ) {
        <tbody class="plugins">
 <?php
        foreach ( (array) $plugins as $plugin_file => $plugin_data) {
                $info = plugins_api('plugin_information', array('slug' => $plugin_data->update->slug ));
                if ( is_wp_error( $info ) ) {

-                       continue;
+                       $info = false;

                }
 
                // Get plugin compat for running version of WordPress.
                }
 
                // Get plugin compat for running version of WordPress.


@@ -282,6 +276,13 @@ function list_plugin_updates() {
        }
 ?>
        </tbody>
        }
 ?>
        </tbody>

+
+       <tfoot>
+       <tr>
+               <th scope="col" class="manage-column check-column"><input type="checkbox" id="plugins-select-all-2" /></th>
+               <th scope="col" class="manage-column"><label for="plugins-select-all-2"><?php _e( 'Select All' ); ?></label></th>
+       </tr>
+       </tfoot>

 </table>
 <p><input id="upgrade-plugins-2" class="button" type="submit" value="<?php esc_attr_e('Update Plugins'); ?>" name="upgrade" /></p>
 </form>
 </table>
 <p><input id="upgrade-plugins-2" class="button" type="submit" value="<?php esc_attr_e('Update Plugins'); ?>" name="upgrade" /></p>
 </form>


@@ -301,7 +302,7 @@ function list_theme_updates() {
 ?>
 <h3><?php _e( 'Themes' ); ?></h3>
 <p><?php _e( 'The following themes have new versions available. Check the ones you want to update and then click &#8220;Update Themes&#8221;.' ); ?></p>
 ?>
 <h3><?php _e( 'Themes' ); ?></h3>
 <p><?php _e( 'The following themes have new versions available. Check the ones you want to update and then click &#8220;Update Themes&#8221;.' ); ?></p>

-<p><?php printf( __( '<strong>Please Note:</strong> Any customizations you have made to theme files will be lost. Please consider using <a href="%s">child themes</a> for modifications.' ), __( 'http://codex.wordpress.org/Child_Themes' ) ); ?></p>
+<p><?php printf( __( '<strong>Please Note:</strong> Any customizations you have made to theme files will be lost. Please consider using <a href="%s">child themes</a> for modifications.' ), __( 'https://codex.wordpress.org/Child_Themes' ) ); ?></p>

 <form method="post" action="<?php echo esc_url( $form_action ); ?>" name="upgrade-themes" class="upgrade">
 <?php wp_nonce_field('upgrade-core'); ?>
 <p><input id="upgrade-themes" class="button" type="submit" value="<?php esc_attr_e('Update Themes'); ?>" name="upgrade" /></p>
 <form method="post" action="<?php echo esc_url( $form_action ); ?>" name="upgrade-themes" class="upgrade">
 <?php wp_nonce_field('upgrade-core'); ?>
 <p><input id="upgrade-themes" class="button" type="submit" value="<?php esc_attr_e('Update Themes'); ?>" name="upgrade" /></p>


@@ -313,12 +314,6 @@ function list_theme_updates() {
        </tr>
        </thead>
 
        </tr>
        </thead>
 

-       <tfoot>
-       <tr>
-               <th scope="col" class="manage-column check-column"><input type="checkbox" id="themes-select-all-2" /></th>
-               <th scope="col" class="manage-column"><label for="themes-select-all-2"><?php _e('Select All'); ?></label></th>
-       </tr>
-       </tfoot>

        <tbody class="plugins">
 <?php
        foreach ( $themes as $stylesheet => $theme ) {
        <tbody class="plugins">
 <?php
        foreach ( $themes as $stylesheet => $theme ) {


@@ -330,6 +325,13 @@ function list_theme_updates() {
        }
 ?>
        </tbody>
        }
 ?>
        </tbody>

+
+       <tfoot>
+       <tr>
+               <th scope="col" class="manage-column check-column"><input type="checkbox" id="themes-select-all-2" /></th>
+               <th scope="col" class="manage-column"><label for="themes-select-all-2"><?php _e( 'Select All' ); ?></label></th>
+       </tr>
+       </tfoot>

 </table>
 <p><input id="upgrade-themes-2" class="button" type="submit" value="<?php esc_attr_e('Update Themes'); ?>" name="upgrade" /></p>
 </form>
 </table>
 <p><input id="upgrade-themes-2" class="button" type="submit" value="<?php esc_attr_e('Update Themes'); ?>" name="upgrade" /></p>
 </form>


@@ -350,7 +352,7 @@ function list_translation_updates() {
        ?>
        <h3><?php _e( 'Translations' ); ?></h3>
        <form method="post" action="<?php echo esc_url( $form_action ); ?>" name="upgrade-translations" class="upgrade">
        ?>
        <h3><?php _e( 'Translations' ); ?></h3>
        <form method="post" action="<?php echo esc_url( $form_action ); ?>" name="upgrade-translations" class="upgrade">

-               <p><?php _e( 'Some of your translations are out of date.' ); ?></p>
+               <p><?php _e( 'New translations are available.' ); ?></p>

                <?php wp_nonce_field( 'upgrade-translations' ); ?>
                <p><input class="button" type="submit" value="<?php esc_attr_e( 'Update Translations' ); ?>" name="upgrade" /></p>
        </form>
                <?php wp_nonce_field( 'upgrade-translations' ); ?>
                <p><input class="button" type="submit" value="<?php esc_attr_e( 'Update Translations' ); ?>" name="upgrade" /></p>
        </form>


@@ -390,14 +392,14 @@ function do_core_upgrade( $reinstall = false ) {
        <h2><?php _e('Update WordPress'); ?></h2>
 <?php
 
        <h2><?php _e('Update WordPress'); ?></h2>
 <?php
 

-       if ( false === ( $credentials = request_filesystem_credentials( $url, '', false, ABSPATH, array(), $allow_relaxed_file_ownership ) ) ) {
+       if ( false === ( $credentials = request_filesystem_credentials( $url, '', false, ABSPATH, array( 'version', 'locale' ), $allow_relaxed_file_ownership ) ) ) {

                echo '</div>';
                return;
        }
 
        if ( ! WP_Filesystem( $credentials, ABSPATH, $allow_relaxed_file_ownership ) ) {
                // Failed to connect, Error and request again
                echo '</div>';
                return;
        }
 
        if ( ! WP_Filesystem( $credentials, ABSPATH, $allow_relaxed_file_ownership ) ) {
                // Failed to connect, Error and request again

-               request_filesystem_credentials( $url, '', true, ABSPATH, array(), $allow_relaxed_file_ownership );
+               request_filesystem_credentials( $url, '', true, ABSPATH, array( 'version', 'locale' ), $allow_relaxed_file_ownership );

                echo '</div>';
                return;
        }
                echo '</div>';
                return;
        }


@@ -496,7 +498,7 @@ get_current_screen()->add_help_tab( array(
 
 get_current_screen()->set_help_sidebar(
        '<p><strong>' . __('For more information:') . '</strong></p>' .
 
 get_current_screen()->set_help_sidebar(
        '<p><strong>' . __('For more information:') . '</strong></p>' .

-       '<p>' . __( '<a href="http://codex.wordpress.org/Dashboard_Updates_Screen" target="_blank">Documentation on Updating WordPress</a>' ) . '</p>' .
+       '<p>' . __( '<a href="https://codex.wordpress.org/Dashboard_Updates_Screen" target="_blank">Documentation on Updating WordPress</a>' ) . '</p>' .

        '<p>' . __( '<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>' ) . '</p>'
 );
 
        '<p>' . __( '<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>' ) . '</p>'
 );