From b97dd529fa1f6c40841da0b695a16bf979ae3dd7 Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Thu, 1 Oct 2015 05:09:50 +0000
Subject: [PATCH] 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
---
 wp-includes/canonical.php | 9 ++-------
 wp-includes/version.php   | 2 +-
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/wp-includes/canonical.php b/wp-includes/canonical.php
index 3a30b47e00..16ffc7d00d 100644
--- a/wp-includes/canonical.php
+++ b/wp-includes/canonical.php
@@ -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;
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 03b9d1761b..15f8b2c45b 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -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.