Changeset 8732 for trunk/wp-includes/canonical.php

Timestamp:

08/25/2008 09:50:11 PM (17 years ago)

Author:

ryan

Message:

Notice fixes. see #7509

File:

• trunk/wp-includes/canonical.php (modified) (1 diff)

trunk/wp-includes/canonical.php

@@ -157 +157 @@
     $redirect['path'] = preg_replace( '#(%20| )+$#', '', $redirect['path'] );
 
-    // Remove trailing slashes from certain terminating query string args
-    $redirect['query'] = preg_replace( '#((p|page_id|cat|tag)=[^&]*?)(%20| )+$#', '$1', $redirect['query'] );
-
-    // Clean up empty query strings
-    $redirect['query'] = preg_replace( '#&?(p|page_id|cat|tag)=?$#', '', $redirect['query'] );
+    if ( isset( $redirect['query'] ) ) {
+        // Remove trailing slashes from certain terminating query string args
+        $redirect['query'] = preg_replace( '#((p|page_id|cat|tag)=[^&]*?)(%20| )+$#', '$1', $redirect['query'] );
+
+        // Clean up empty query strings
+        $redirect['query'] = preg_replace( '#&?(p|page_id|cat|tag)=?$#', '', $redirect['query'] );
+    }
 
     // strip /index.php/ when we're not using PATHINFO permalinks