Remove rededundant code. see #14292

git-svn-id: http://svn.automattic.com/wordpress/trunk@15444 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2010-07-18 14:06:14 +00:00
parent d9f3dd305a
commit 614d734492

View File

@ -354,14 +354,6 @@ function redirect_canonical($requested_url=null, $do_redirect=true) {
$requested_url = preg_replace_callback('|%[a-fA-F0-9][a-fA-F0-9]|', 'lowercase_octets', $requested_url); $requested_url = preg_replace_callback('|%[a-fA-F0-9][a-fA-F0-9]|', 'lowercase_octets', $requested_url);
} }
// Hex encoded octets are case-insensitive.
if ( false !== strpos($requested_url, '%') ) {
function lowercase_octets($matches) {
return strtolower($matches[0]);
}
$requested_url = preg_replace_callback('|%[a-fA-F0-9][a-fA-F0-9]|', 'lowercase_octets', $requested_url);
}
// Note that you can use the "redirect_canonical" filter to cancel a canonical redirect for whatever reason by returning FALSE // Note that you can use the "redirect_canonical" filter to cancel a canonical redirect for whatever reason by returning FALSE
$redirect_url = apply_filters('redirect_canonical', $redirect_url, $requested_url); $redirect_url = apply_filters('redirect_canonical', $redirect_url, $requested_url);