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

Canonical: remove unused code (commented-out) from `redirect_canonical()`. 

Props hakre, chriscct7.
Fixes #16934.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34698 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2015-10-01 05:09:50 +00:00
parent 731b51ee7f
commit b97dd529fa
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wp-includes/canonical.php
View File

@ -67,14 +67,9 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) {
}
$original = @parse_url($requested_url);
if ( false === $original )
if ( false === $original ) {
return;
// Some PHP setups turn requests for / into /index.php in REQUEST_URI
// See: https://core.trac.wordpress.org/ticket/5017
// See: https://core.trac.wordpress.org/ticket/7173
// Disabled, for now:
// $original['path'] = preg_replace('|/index\.php$|', '/', $original['path']);
}
$redirect = $original;
$redirect_url = false;

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.4-alpha-34733';
$wp_version = '4.4-alpha-34734';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.