Changeset 3226 for trunk/wp-includes/classes.php

Timestamp:

11/28/2005 11:30:42 PM (19 years ago)

Author:

ryan

Message:

Don't try to do permalinks for admin pages.

File:

• trunk/wp-includes/classes.php (modified) (2 diffs)

trunk/wp-includes/classes.php

@@ -1483 +1483 @@
                     // If we're processing a 404 request, clear the error var
                     // since we found something.
-                    if (isset($_GET['error'])) {
+                    if (isset($_GET['error']))
                         unset($_GET['error']);
-                    }
-
-                    if (isset($error)) {
+
+                    if (isset($error))
                         unset($error);
-                    }
 
                     break;
@@ -1496 +1494 @@
 
             // If req_uri is empty or if it is a request for ourself, unset error.
-            if ( empty($request) || $req_uri == $self ) {
-                if (isset($_GET['error'])) {
+            if ( empty($request) || $req_uri == $self || strstr($_SERVER['PHP_SELF'], 'wp-admin/') ) {
+                if (isset($_GET['error']))
                     unset($_GET['error']);
-                }
-
-                if (isset($error)) {
+
+                if (isset($error))
                     unset($error);
-                }
+                    
+                if ( isset($query_vars) )
+                    unset($query_vars);
+                    
+                $this->did_permalink = false;
             }
         }