Ticket #19762: 19762.diff
| File 19762.diff, 10.4 KB (added by , 13 years ago) |
|---|
-
wp-includes/admin-bar.php
75 75 $wp_admin_bar->add_menu( array( 76 76 'id' => 'wp-logo', 77 77 'title' => '<span class="ab-icon"></span>', 78 'href' => admin_url( 'about.php' ),78 'href' => is_network_admin() ? network_admin_url( 'about.php' ) : admin_url( 'about.php' ), 79 79 'meta' => array( 80 80 'title' => __('About WordPress'), 81 81 ), … … 87 87 'parent' => 'wp-logo', 88 88 'id' => 'about', 89 89 'title' => __('About WordPress'), 90 'href' => admin_url('about.php'),90 'href' => is_network_admin() ? network_admin_url( 'about.php' ) : admin_url( 'about.php' ), 91 91 ) ); 92 92 } 93 93 -
wp-admin/includes/update-core.php
601 601 /** 602 602 * Redirect to the About WordPress page after a successful upgrade. 603 603 * 604 * This function is only needed when the existing install is older than 3.3.0 .604 * This function is only needed when the existing install is older than 3.3.0 (3.4.0 for multisite). 605 605 * 606 606 * @since 3.3.0 607 607 * … … 609 609 function _redirect_to_about_wordpress( $new_version ) { 610 610 global $wp_version, $pagenow, $action; 611 611 612 if ( version_compare( $wp_version, '3.3', '>=' ) ) 612 if ( is_multisite() ) { 613 // Change to self_admin_url(). 614 if ( version_compare( $wp_version, '3.4-alpha', '>=' ) ) 615 return; 616 } elseif ( version_compare( $wp_version, '3.3', '>=' ) ) { 613 617 return; 618 } 614 619 615 620 // Ensure we only run this on the update-core.php page. wp_update_core() could be called in other contexts. 616 621 if ( 'update-core.php' != $pagenow ) … … 624 629 625 630 // See do_core_upgrade() 626 631 show_message( __('WordPress updated successfully') ); 627 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>' );628 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>' );632 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>' ); 633 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>' ); 629 634 echo '</div>'; 630 635 ?> 631 636 <script type="text/javascript"> 632 window.location = '<?php echo admin_url( 'about.php?updated' ); ?>';637 window.location = '<?php echo self_admin_url( 'about.php?updated' ); ?>'; 633 638 </script> 634 639 <?php 635 640 -
wp-admin/freedoms.php
13 13 14 14 list( $display_version ) = explode( '-', $wp_version ); 15 15 16 include( './admin-header.php' );16 include( ABSPATH . 'wp-admin/admin-header.php' ); 17 17 ?> 18 18 <div class="wrap about-wrap"> 19 19 … … 54 54 <p><?php _e( 'Don’t you wish all software came with these freedoms? So do we! For more information, check out the <a href="http://www.fsf.org/">Free Software Foundation</a>.' ); ?></p> 55 55 56 56 </div> 57 <?php include( './admin-footer.php' ); ?>57 <?php include( ABSPATH . 'wp-admin/admin-footer.php' ); ?> -
wp-admin/credits.php
44 44 45 45 list( $display_version ) = explode( '-', $wp_version ); 46 46 47 include( './admin-header.php' );47 include( ABSPATH . 'wp-admin/admin-header.php' ); 48 48 ?> 49 49 <div class="wrap about-wrap"> 50 50 … … 73 73 'http://wordpress.org/about/', 74 74 /* translators: Url to the codex documentation on contributing to WordPress used on the credits page */ 75 75 __( 'http://codex.wordpress.org/Contributing_to_WordPress' ) ) . '</p>'; 76 include( './admin-footer.php' );76 include( ABSPATH . 'wp-admin/admin-footer.php' ); 77 77 exit; 78 78 } 79 79 … … 134 134 </div> 135 135 <?php 136 136 137 include( './admin-footer.php' );137 include( ABSPATH . 'wp-admin/admin-footer.php' ); 138 138 139 139 return; 140 140 -
wp-admin/update-core.php
180 180 echo '<p>' . __( 'While your site is being updated, it will be in maintenance mode. As soon as your updates are complete, your site will return to normal.' ) . '</p>'; 181 181 } else { 182 182 list( $normalized_version ) = explode( '-', $wp_version ); 183 echo '<p>' . sprintf( __( '<a href="%s">Learn more about WordPress %s</a>.' ), esc_url( admin_url( 'about.php' ) ), $normalized_version ) . '</p>';183 echo '<p>' . sprintf( __( '<a href="%s">Learn more about WordPress %s</a>.' ), esc_url( self_admin_url( 'about.php' ) ), $normalized_version ) . '</p>'; 184 184 } 185 185 dismissed_updates(); 186 186 … … 382 382 } 383 383 384 384 show_message( __('WordPress updated successfully') ); 385 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( admin_url( 'about.php?updated' ) ) ) . '</span>' );386 show_message( '<span class="hide-if-js">' . sprintf( __( 'Welcome to WordPress %1$s. <a href="%2$s">Learn more</a>.' ), $result, esc_url( admin_url( 'about.php?updated' ) ) ) . '</span>' );385 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>' ); 386 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>' ); 387 387 ?> 388 388 </div> 389 389 <script type="text/javascript"> 390 window.location = '<?php echo admin_url( 'about.php?upgraded' ); ?>';390 window.location = '<?php echo self_admin_url( 'about.php?upgraded' ); ?>'; 391 391 </script> 392 392 <?php 393 393 } -
wp-admin/about.php
13 13 14 14 list( $display_version ) = explode( '-', $wp_version ); 15 15 16 include( './admin-header.php' );16 include( ABSPATH . 'wp-admin/admin-header.php' ); 17 17 ?> 18 18 <div class="wrap about-wrap"> 19 19 … … 38 38 39 39 <div class="feature-section images-stagger-right"> 40 40 <div class="feature-images"> 41 <img src=" images/screenshots/media-icon.png" width="200" class="angled-right" />42 <img src=" images/screenshots/drag-and-drop.png" width="200" class="angled-left" />41 <img src="<?php echo admin_url( 'images/screenshots/media-icon.png' ); ?>" width="200" class="angled-right" /> 42 <img src="<?php echo admin_url( 'images/screenshots/drag-and-drop.png' ); ?>" width="200" class="angled-left" /> 43 43 </div> 44 44 <div class="left-feature"> 45 45 <h4><?php _e( 'File Type Detection' ); ?></h4> … … 69 69 70 70 <div class="feature-section screenshot-features"> 71 71 <div class="angled-left"> 72 <img src=" images/screenshots/admin-flyouts.png" />72 <img src="<?php echo admin_url( 'images/screenshots/admin-flyouts.png' ); ?>" /> 73 73 <h4><?php _e( 'Responsive Design' ); ?></h4> 74 74 <p><?php _e( 'Certain dashboard screens have been updated to look better at various sizes, including improved iPad/tablet support.' ); ?></p> 75 75 </div> 76 76 <div class="angled-right"> 77 <img src=" images/screenshots/help-screen.png" />77 <img src="<?php echo admin_url( 'images/screenshots/help-screen.png' ); ?>" /> 78 78 <h4><?php _e( 'Help Tabs' ); ?></h4> 79 79 <p><?php _e( 'The Help tabs located in the upper corner of the dashboard screens below your name have gotten a facelift. Help content is broken into smaller sections for easier access, with links to relevant documentation and the support forums always visible.' ); ?></p> 80 80 </div> … … 86 86 87 87 <div class="feature-section images-stagger-right"> 88 88 <div class="feature-images"> 89 <img src=" images/screenshots/new-feature-pointer.png" class="angled-right" />90 <img src=" images/screenshots/welcome-screen.png" class="angled-left" />89 <img src="<?php echo admin_url( 'images/screenshots/new-feature-pointer.png' ); ?>" class="angled-right" /> 90 <img src="<?php echo admin_url( 'images/screenshots/welcome-screen.png' ); ?>" class="angled-left" /> 91 91 </div> 92 92 <div class="left-feature"> 93 93 <h4><?php _e( 'New Feature Pointers' ); ?></h4> … … 109 109 <div class="feature-section three-col"> 110 110 <div> 111 111 <h4><?php _e( 'Better Co-Editing' ); ?></h4> 112 <img src=" images/screenshots/coediting.png" class="element-screenshot" />112 <img src="<?php echo admin_url( 'images/screenshots/coediting.png' ); ?>" class="element-screenshot" /> 113 113 <p><?php _e( 'Have you ever gone to edit a post after someone else has finished with it, only to get an alert that tells you the other person is still editing the post? From now on, you’ll only get that alert if another person is still on the editing screen — no more time lag.' ); ?></p> 114 114 </div> 115 115 <div> … … 161 161 162 162 <div class="return-to-dashboard"> 163 163 <?php if ( current_user_can( 'update_core' ) && isset( $_GET['updated'] ) ) : ?> 164 <a href="<?php echo esc_url( network_admin_url( 'update-core.php' ) ); ?>"><?php164 <a href="<?php echo esc_url( self_admin_url( 'update-core.php' ) ); ?>"><?php 165 165 is_multisite() ? _e( 'Return to Updates' ) : _e( 'Return to Dashboard → Updates' ); 166 166 ?></a> | 167 167 <?php endif; ?> 168 <a href="<?php echo esc_url( admin_url() ); ?>"><?php _e( 'Go to Dashboard → Home' ); ?></a> 168 <a href="<?php echo esc_url( self_admin_url() ); ?>"><?php 169 is_network_admin() ? _e( 'Go to Dashboard' ) : _e( 'Go to Dashboard → Home' ); ?></a> 169 170 </div> 170 171 171 172 </div> 172 173 <?php 173 174 174 include( './admin-footer.php' );175 include( ABSPATH . 'wp-admin/admin-footer.php' ); 175 176 176 177 // These are strings we may use to describe maintenance/security releases, where we aim for no new strings. 177 178 return;