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

Let wp-admin work as well as wp-admin/ for the canonical redirect. see #19607. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@19878 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2012-02-08 18:03:25 +00:00
parent 71c82d0eaf
commit 6300514de7
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/canonical.php
View File

@ -93,7 +93,7 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) {
}
if ( ! $redirect_url && get_option( 'home' ) != get_option( 'siteurl' ) ) {
if ( $original['path'] == home_url( 'wp-admin/', 'relative' ) )
if ( trailingslashit( $original['path'] ) == home_url( 'wp-admin/', 'relative' ) )
$redirect_url = admin_url();
elseif ( $original['path'] == home_url( 'wp-login.php', 'relative' ) )
$redirect_url = site_url( 'wp-login.php', 'login' );