WordPress 4.0

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

diff --git a/wp-admin/update-core.php b/wp-admin/update-core.php
index a8a7aa9909fe57b57b6fd8814345fc34cd70bc33..f88025e09bcaa643fa24b3879f2dcb328534c640 100644 (file)
--- a/wp-admin/update-core.php
+++ b/wp-admin/update-core.php
@@ -174,12 +174,14 @@ function core_upgrade_preamble() {
        if ( isset( $updates[0] ) && $updates[0]->response == 'development' ) {
                require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
                $upgrader = new WP_Automatic_Updater;
-               if ( wp_http_supports( 'ssl' ) && $upgrader->should_update( 'core', $updates[0], ABSPATH ) )
-                       echo '<div class="updated inline"><p><strong>BETA TESTERS:</strong> This site is set up to install updates of future beta versions automatically.</p></div>';
+               if ( wp_http_supports( 'ssl' ) && $upgrader->should_update( 'core', $updates[0], ABSPATH ) ) {
+                       echo '<div class="updated inline"><p>';
+                       echo '<strong>' . __( 'BETA TESTERS:' ) . '</strong> ' . __( 'This site is set up to install updates of future beta versions automatically.' );
+                       echo '</p></div>';
+               }
        }
 
        echo '<ul class="core-updates">';
-       $alternate = true;
        foreach( (array) $updates as $update ) {
                echo '<li>';
                list_core_update( $update );
@@ -343,9 +345,9 @@ function list_translation_updates() {
        $form_action = 'update-core.php?action=do-translation-upgrade';
        ?>
        <h3><?php _e( 'Translations' ); ?></h3>
-       <form method="post" action="<?php echo esc_url( $form_action ); ?>" name="upgrade-themes" class="upgrade">
+       <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>
-               <?php wp_nonce_field('upgrade-translations'); ?>
+               <?php wp_nonce_field( 'upgrade-translations' ); ?>
                <p><input class="button" type="submit" value="<?php esc_attr_e( 'Update Translations' ); ?>" name="upgrade" /></p>
        </form>
        <?php
@@ -361,7 +363,7 @@ function list_translation_updates() {
 function do_core_upgrade( $reinstall = false ) {
        global $wp_filesystem;
 
-       include_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
+       include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
 
        if ( $reinstall )
                $url = 'update-core.php?action=do-core-reinstall';
@@ -538,8 +540,7 @@ if ( 'upgrade-core' == $action ) {
 
        check_admin_referer('upgrade-core');
 
-       // do the (un)dismiss actions before headers,
-       // so that they can redirect
+       // Do the (un)dismiss actions before headers, so that they can redirect.
        if ( isset( $_POST['dismiss'] ) )
                do_dismiss_core_update();
        elseif ( isset( $_POST['undismiss'] ) )
@@ -580,7 +581,7 @@ if ( 'upgrade-core' == $action ) {
        require_once(ABSPATH . 'wp-admin/admin-header.php');
        echo '<div class="wrap">';
        echo '<h2>' . esc_html__('Update Plugins') . '</h2>';
-       echo "<iframe src='$url' style='width: 100%; height: 100%; min-height: 750px;' frameborder='0'></iframe>";
+       echo '<iframe src="', $url, '" style="width: 100%; height: 100%; min-height: 750px;" frameborder="0"></iframe>';
        echo '</div>';
        include(ABSPATH . 'wp-admin/admin-footer.php');
 
@@ -606,10 +607,12 @@ if ( 'upgrade-core' == $action ) {
        $title = __('Update Themes');
 
        require_once(ABSPATH . 'wp-admin/admin-header.php');
-       echo '<div class="wrap">';
-       echo '<h2>' . esc_html__('Update Themes') . '</h2>';
-       echo "<iframe src='$url' style='width: 100%; height: 100%; min-height: 750px;' frameborder='0'></iframe>";
-       echo '</div>';
+       ?>
+       <div class="wrap">
+               <h2><?php echo esc_html__('Update Themes') ?></h2>
+               <iframe src="<?php echo $url ?>" style="width: 100%; height: 100%; min-height: 750px;" frameborder="0"></iframe>
+       </div>
+       <?php
        include(ABSPATH . 'wp-admin/admin-footer.php');
 
 } elseif ( 'do-translation-upgrade' == $action ) {