Changeset 3108

Timestamp:

11/16/2005 10:16:20 AM (21 years ago)

Author:

ryan

Message:

Fix 404s. Props donncha. fixes #1471

File:

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

trunk/wp-includes/classes.php

@@ -1489 +1489 @@
                     }
                 }
+
+                // If req_uri is empty, the home page was requested.  Unset error.
+                if ( empty($req_uri) ) {
+                    if (isset($_GET['error'])) {
+                        unset($_GET['error']);
+                    }
+
+                    if (isset($error)) {
+                        unset($error);
+                    }
+                }
             }
         }
@@ -1509 +1520 @@
                 $this->query_vars[$wpvar] = '';
         }
+
+        if ( isset($error) )
+            $this->query_vars['error'] = $error;
     }
 
@@ -1603 +1617 @@
         // or if the request was a regular query string request rather than a
         // permalink request.
-        if ( (0 == count($wp_query->posts)) && !is_404() && !is_search()
-                 && ( $this->did_permalink || (!empty($_SERVER['QUERY_STRING']) &&
-                                                                    (false === strpos($_SERVER['REQUEST_URI'], '?'))) ) ) {
+        if ( (0 == count($wp_query->posts)) && !is_404() && !is_search() && ( $this->did_permalink || (!empty($_SERVER['QUERY_STRING']) && (false === strpos($_SERVER['REQUEST_URI'], '?'))) ) ) {
             $wp_query->set_404();
             status_header( 404 );
-        }   else {
+        }   elseif( is_404() != true ) {
             status_header( 200 );
         }