]> scripts.mit.edu Git - autoinstalls/wordpress.git/blobdiff - wp-includes/class-wp.php
WordPress 3.4
[autoinstalls/wordpress.git] / wp-includes / class-wp.php
index cf671bd79dc9025723b9250a02e84383ed9a3260..4f8bc3582593ddb8c5a0b43e6731407f0adb4c38 100644 (file)
@@ -15,7 +15,7 @@ class WP {
         * @access public
         * @var array
         */
-       var $public_query_vars = array('m', 'p', 'posts', 'w', 'cat', 'withcomments', 'withoutcomments', 's', 'search', 'exact', 'sentence', 'debug', 'calendar', 'page', 'paged', 'more', 'tb', 'pb', 'author', 'order', 'orderby', 'year', 'monthnum', 'day', 'hour', 'minute', 'second', 'name', 'category_name', 'tag', 'feed', 'author_name', 'static', 'pagename', 'page_id', 'error', 'comments_popup', 'attachment', 'attachment_id', 'subpost', 'subpost_id', 'preview', 'robots', 'taxonomy', 'term', 'cpage', 'post_type');
+       var $public_query_vars = array('m', 'p', 'posts', 'w', 'cat', 'withcomments', 'withoutcomments', 's', 'search', 'exact', 'sentence', 'calendar', 'page', 'paged', 'more', 'tb', 'pb', 'author', 'order', 'orderby', 'year', 'monthnum', 'day', 'hour', 'minute', 'second', 'name', 'category_name', 'tag', 'feed', 'author_name', 'static', 'pagename', 'page_id', 'error', 'comments_popup', 'attachment', 'attachment_id', 'subpost', 'subpost_id', 'preview', 'robots', 'taxonomy', 'term', 'cpage', 'post_type');
 
        /**
         * Private query variables.
@@ -156,8 +156,8 @@ class WP {
                        $home_path = trim($home_path, '/');
 
                        // Trim path info from the end and the leading home path from the
-                       // front.  For path info requests, this leaves us with the requesting
-                       // filename, if any.  For 404 requests, this leaves us with the
+                       // front. For path info requests, this leaves us with the requesting
+                       // filename, if any. For 404 requests, this leaves us with the
                        // requested permalink.
                        $req_uri = str_replace($pathinfo, '', $req_uri);
                        $req_uri = trim($req_uri, '/');
@@ -185,54 +185,60 @@ class WP {
 
                        // Look for matches.
                        $request_match = $request;
-                       foreach ( (array) $rewrite as $match => $query) {
-                               // Don't try to match against AtomPub calls
-                               if ( $req_uri == 'wp-app.php' )
-                                       break;
-
-                               // If the requesting file is the anchor of the match, prepend it
-                               // to the path info.
-                               if ( (! empty($req_uri)) && (strpos($match, $req_uri) === 0) && ($req_uri != $request) )
-                                       $request_match = $req_uri . '/' . $request;
-
-                               if ( preg_match("#^$match#", $request_match, $matches) ||
-                                       preg_match("#^$match#", urldecode($request_match), $matches) ) {
-                                       // Got a match.
-                                       $this->matched_rule = $match;
-
-                                       // Trim the query of everything up to the '?'.
-                                       $query = preg_replace("!^.+\?!", '', $query);
+                       if ( empty( $request_match ) ) {
+                               // An empty request could only match against ^$ regex
+                               if ( isset( $rewrite['$'] ) ) {
+                                       $this->matched_rule = '$';
+                                       $query = $rewrite['$'];
+                                       $matches = array('');
+                               }
+                       } else if ( $req_uri != 'wp-app.php' ) {
+                               foreach ( (array) $rewrite as $match => $query ) {
+                                       // If the requesting file is the anchor of the match, prepend it to the path info.
+                                       if ( ! empty($req_uri) && strpos($match, $req_uri) === 0 && $req_uri != $request )
+                                               $request_match = $req_uri . '/' . $request;
+
+                                       if ( preg_match("#^$match#", $request_match, $matches) ||
+                                               preg_match("#^$match#", urldecode($request_match), $matches) ) {
+
+                                               if ( $wp_rewrite->use_verbose_page_rules && preg_match( '/pagename=\$matches\[([0-9]+)\]/', $query, $varmatch ) ) {
+                                                       // this is a verbose page match, lets check to be sure about it
+                                                       if ( ! get_page_by_path( $matches[ $varmatch[1] ] ) )
+                                                               continue;
+                                               }
 
-                                       // Substitute the substring matches into the query.
-                                       $query = addslashes(WP_MatchesMapRegex::apply($query, $matches));
+                                               // Got a match.
+                                               $this->matched_rule = $match;
+                                               break;
+                                       }
+                               }
+                       }
 
-                                       $this->matched_query = $query;
+                       if ( isset( $this->matched_rule ) ) {
+                               // Trim the query of everything up to the '?'.
+                               $query = preg_replace("!^.+\?!", '', $query);
 
-                                       // Parse the query.
-                                       parse_str($query, $perma_query_vars);
+                               // Substitute the substring matches into the query.
+                               $query = addslashes(WP_MatchesMapRegex::apply($query, $matches));
 
-                                       // If we're processing a 404 request, clear the error var
-                                       // since we found something.
-                                       if ( isset($_GET['error']) )
-                                               unset($_GET['error']);
+                               $this->matched_query = $query;
 
-                                       if ( isset($error) )
-                                               unset($error);
+                               // Parse the query.
+                               parse_str($query, $perma_query_vars);
 
-                                       break;
-                               }
+                               // If we're processing a 404 request, clear the error var
+                               // since we found something.
+                               unset( $_GET['error'] );
+                               unset( $error );
                        }
 
                        // If req_uri is empty or if it is a request for ourself, unset error.
                        if ( empty($request) || $req_uri == $self || strpos($_SERVER['PHP_SELF'], 'wp-admin/') !== false ) {
-                               if ( isset($_GET['error']) )
-                                       unset($_GET['error']);
-
-                               if ( isset($error) )
-                                       unset($error);
+                               unset( $_GET['error'] );
+                               unset( $error );
 
                                if ( isset($perma_query_vars) && strpos($_SERVER['PHP_SELF'], 'wp-admin/') !== false )
-                                       unset($perma_query_vars);
+                                       unset( $perma_query_vars );
 
                                $this->did_permalink = false;
                        }
@@ -395,7 +401,7 @@ class WP {
                        }
                }
 
-               // query_string filter deprecated.  Use request filter instead.
+               // query_string filter deprecated. Use request filter instead.
                if ( has_filter('query_string') ) {  // Don't bother filtering and parsing if no plugins are hooked in.
                        $this->query_string = apply_filters('query_string', $this->query_string);
                        parse_str($this->query_string, $this->query_vars);
@@ -468,19 +474,36 @@ class WP {
        function handle_404() {
                global $wp_query;
 
-               if ( !is_admin() && ( 0 == count( $wp_query->posts ) ) && !is_404() && !is_robots() && !is_search() && !is_home() ) {
+               // If we've already issued a 404, bail.
+               if ( is_404() )
+                       return;
+
+               // Never 404 for the admin, robots, or if we found posts.
+               if ( is_admin() || is_robots() || $wp_query->posts ) {
+                       status_header( 200 );
+                       return;
+               }
+
+               // We will 404 for paged queries, as no posts were found.
+               if ( ! is_paged() ) {
+
                        // Don't 404 for these queries if they matched an object.
-                       if ( ( is_tag() || is_category() || is_tax() || is_author() || is_post_type_archive() ) && $wp_query->get_queried_object() && !is_paged() ) {
-                               if ( !is_404() )
-                                       status_header( 200 );
+                       if ( ( is_tag() || is_category() || is_tax() || is_author() || is_post_type_archive() ) && $wp_query->get_queried_object() ) {
+                               status_header( 200 );
+                               return;
+                       }
+
+                       // Don't 404 for these queries either.
+                       if ( is_home() || is_search() ) {
+                               status_header( 200 );
                                return;
                        }
-                       $wp_query->set_404();
-                       status_header( 404 );
-                       nocache_headers();
-               } elseif ( !is_404() ) {
-                       status_header( 200 );
                }
+
+               // Guess it's time to 404.
+               $wp_query->set_404();
+               status_header( 404 );
+               nocache_headers();
        }
 
        /**
@@ -563,11 +586,11 @@ class WP_MatchesMapRegex {
         *
         * @access public
         * @param string $subject subject
-        * @param array  $matches data used for subsitution
+        * @param array  $matches data used for substitution
         * @return string
         */
-       function apply($subject, $matches) {
-               $oSelf =& new WP_MatchesMapRegex($subject, $matches);
+       public static function apply($subject, $matches) {
+               $oSelf = new WP_MatchesMapRegex($subject, $matches);
                return $oSelf->output;
        }
 
@@ -595,5 +618,3 @@ class WP_MatchesMapRegex {
        }
 
 }
-
-?>