From c32367033145a6666c59f41a78a4bbf0517ed34b Mon Sep 17 00:00:00 2001
From: markjaquith <markjaquith@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Wed, 12 Nov 2008 21:55:25 +0000
Subject: [PATCH] Revert [9193]. See #6627. Will revisit for 2.8

git-svn-id: http://svn.automattic.com/wordpress/trunk@9649 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/canonical.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/wp-includes/canonical.php b/wp-includes/canonical.php
index 7e10c91832..cfeff18c45 100644
--- a/wp-includes/canonical.php
+++ b/wp-includes/canonical.php
@@ -87,8 +87,6 @@ function redirect_canonical($requested_url=null, $do_redirect=true) {
 		if ( is_single() && !empty($_GET['p']) && ! $redirect_url ) {
 			if ( $redirect_url = get_permalink(get_query_var('p')) )
 				$redirect['query'] = remove_query_arg('p', $redirect['query']);
-		} elseif ( is_single() && ! $redirect_url ) {
-			$redirect_url = get_permalink( url_to_postid( $requested_url ) );
 			if ( get_query_var( 'page' ) ) {
 				$redirect_url = trailingslashit( $redirect_url ) . user_trailingslashit( get_query_var( 'page' ), 'single_paged' );
 				$redirect['query'] = remove_query_arg( 'page', $redirect['query'] );