WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

When altering the admin URL to reflect the canonical location, keep the existing hash (if present) in the URL. 

Fixes #31758. See #23367

Built from https://develop.svn.wordpress.org/trunk@31882


git-svn-id: http://core.svn.wordpress.org/trunk@31861 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dion Hulse 2015-03-25 04:32:26 +00:00
parent 1c6b1b3414
commit 7b5ae90225
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/includes/misc.php
View File

@ -880,7 +880,7 @@ function wp_admin_canonical_url() {
<link id="wp-admin-canonical" rel="canonical" href="<?php echo esc_url( $filtered_url ); ?>" /> <link id="wp-admin-canonical" rel="canonical" href="<?php echo esc_url( $filtered_url ); ?>" />
<script> <script>
if ( window.history.replaceState ) { if ( window.history.replaceState ) {
window.history.replaceState( null, null, document.getElementById( 'wp-admin-canonical' ).href ); window.history.replaceState( null, null, document.getElementById( 'wp-admin-canonical' ).href + window.location.hash );
} }
</script> </script>
<?php <?php

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.2-beta2-31881'; $wp_version = '4.2-beta2-31882';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.