Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-23 01:27:36 +01:00
Code Issues Projects Releases Wiki Activity

Remove debug cruft and fix variable collision. fixes #18467.

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@19532 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2011-12-01 06:02:18 +00:00
parent d224992729
commit de11d4cb22
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-admin/includes/update-core.php
View File

@ -535,7 +535,7 @@ function _copy_dir($from, $to, $skip_list = array() ) {
* @since 3.3.0 * @since 3.3.0
* *
*/ */
function _redirect_to_about_wordpress( $wp_version ) { function _redirect_to_about_wordpress( $new_version ) {
global $wp_version, $pagenow, $action; global $wp_version, $pagenow, $action;
if ( version_compare( $wp_version, '3.3', '>=' ) ) if ( version_compare( $wp_version, '3.3', '>=' ) )
@ -553,8 +553,8 @@ function _redirect_to_about_wordpress( $wp_version ) {
// See do_core_upgrade() // See do_core_upgrade()
show_message( __('WordPress updated successfully') ); show_message( __('WordPress updated successfully') );
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>.' ), $wp_version, esc_url( admin_url( 'about.php?updated' ) ) ) . '</span>' ); 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( admin_url( 'about.php?updated' ) ) ) . '</span>' );
show_message( '<span class="hide-if-js">' . sprintf( __( 'Welcome to WordPress %1$s. <a href="%2$s">Learn more</a>.' ), $wp_version, esc_url( admin_url( 'about.php?updated' ) ) ) . '</span>' ); show_message( '<span class="hide-if-js">' . sprintf( __( 'Welcome to WordPress %1$s. <a href="%2$s">Learn more</a>.' ), $new_version, esc_url( admin_url( 'about.php?updated' ) ) ) . '</span>' );
echo '</div>'; echo '</div>';
?> ?>
<script type="text/javascript"> <script type="text/javascript">

2
wp-admin/update-core.php
View File

@ -389,7 +389,7 @@ function do_core_upgrade( $reinstall = false ) {
?> ?>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
//window.location = '<?php echo admin_url( 'about.php?upgraded' ); ?>'; window.location = '<?php echo admin_url( 'about.php?upgraded' ); ?>';
</script> </script>
<?php <?php
} }