WordPress.org

Make WordPress Core

Ticket #21511: 21511.2.patch

File 21511.2.patch, 2.8 KB (added by SergeyBiryukov, 3 years ago)
  • wp-admin/includes/update-core.php

     
    698698 
    699699        // See do_core_upgrade() 
    700700        show_message( __('WordPress updated successfully') ); 
    701         show_message( '<span class="hide-if-no-js">' . sprintf( __( 'Welcome to WordPress %1$s. You will be redirected to the About WordPress screen. If not, click <a href="%s">here</a>.' ), $new_version, esc_url( self_admin_url( 'about.php?updated' ) ) ) . '</span>' ); 
    702         show_message( '<span class="hide-if-js">' . sprintf( __( 'Welcome to WordPress %1$s. <a href="%2$s">Learn more</a>.' ), $new_version, esc_url( self_admin_url( 'about.php?updated' ) ) ) . '</span>' ); 
     701        // self_admin_url() won't exist when upgrading from <= 3.0, so relative URLs are intentional. 
     702        show_message( '<span class="hide-if-no-js">' . sprintf( __( 'Welcome to WordPress %1$s. You will be redirected to the About WordPress screen. If not, click <a href="%2$s">here</a>.' ), $new_version, 'about.php?updated' ) . '</span>' ); 
     703        show_message( '<span class="hide-if-js">' . sprintf( __( 'Welcome to WordPress %1$s. <a href="%2$s">Learn more</a>.' ), $new_version, 'about.php?updated' ) . '</span>' ); 
    703704        echo '</div>'; 
    704705        ?> 
    705706<script type="text/javascript"> 
    706 window.location = '<?php echo self_admin_url( 'about.php?updated' ); ?>'; 
     707window.location = 'about.php?updated'; 
    707708</script> 
    708709        <?php 
    709710 
  • wp-admin/update-core.php

     
    354354        } 
    355355 
    356356        show_message( __('WordPress updated successfully') ); 
    357         show_message( '<span class="hide-if-no-js">' . sprintf( __( 'Welcome to WordPress %1$s. You will be redirected to the About WordPress screen. If not, click <a href="%s">here</a>.' ), $result, esc_url( self_admin_url( 'about.php?updated' ) ) ) . '</span>' ); 
    358         show_message( '<span class="hide-if-js">' . sprintf( __( 'Welcome to WordPress %1$s. <a href="%2$s">Learn more</a>.' ), $result, esc_url( self_admin_url( 'about.php?updated' ) ) ) . '</span>' ); 
     357        // self_admin_url() won't exist when upgrading from <= 3.0, so relative URLs are intentional. 
     358        show_message( '<span class="hide-if-no-js">' . sprintf( __( 'Welcome to WordPress %1$s. You will be redirected to the About WordPress screen. If not, click <a href="%2$s">here</a>.' ), $result, 'about.php?updated' ) . '</span>' ); 
     359        show_message( '<span class="hide-if-js">' . sprintf( __( 'Welcome to WordPress %1$s. <a href="%2$s">Learn more</a>.' ), $result, 'about.php?updated' ) . '</span>' ); 
    359360        ?> 
    360361        </div> 
    361362        <script type="text/javascript"> 
    362         window.location = '<?php echo self_admin_url( 'about.php?updated' ); ?>'; 
     363        window.location = 'about.php?updated'; 
    363364        </script> 
    364365        <?php 
    365366}