Changes in trunk/wp-includes/rewrite.php [17226:15109]

File:

• trunk/wp-includes/rewrite.php (modified) (23 diffs)

trunk/wp-includes/rewrite.php

@@ -35 +35 @@
 function add_rewrite_tag($tagname, $regex) {
         //validation
-        if ( strlen($tagname) < 3 || $tagname[0] != '%' || $tagname[strlen($tagname)-1] != '%' )
+        if ( strlen($tagname) < 3 || $tagname{0} != '%' || $tagname{strlen($tagname)-1} != '%' )
                 return;
 
@@ -206 +206 @@
  * "/2008/10/14/my_post/myep/", the endpoint will be "/myep/".
  *
- * Be sure to flush the rewrite rules (wp_rewrite->flush_rules()) when your plugin gets
+ * Be sure to flush the rewrite rules (wp_rewrite->flush()) when your plugin gets
  * activated (register_activation_hook()) and deactivated (register_deactivation_hook())
  *
@@ -268 +268 @@
         if ( empty($rewrite) )
                 return 0;
+
+        // $url cleanup by Mark Jaquith
+        // This fixes things like #anchors, ?query=strings, missing 'www.',
+        // added 'www.', or added 'index.php/' that will mess up our WP_Query
+        // and return a false negative
 
         // Get rid of the #anchor
@@ -295 +300 @@
                 // Chop off /path/to/blog
                 $home_path = parse_url(home_url());
-                $home_path = isset( $home_path['path'] ) ? $home_path['path'] : '' ;
+                $home_path = $home_path['path'];
                 $url = str_replace($home_path, '', $url);
         }
@@ -303 +308 @@
 
         $request = $url;
+
+        // Done with cleanup
 
         // Look for matches.
@@ -331 +338 @@
                         // Do the query
                         $query = new WP_Query($query);
-                        if ( !empty($query->posts) && $query->is_singular )
+                        if ( $query->is_single || $query->is_page )
                                 return $query->post->ID;
                         else
@@ -375 +382 @@
 
         /**
+         * Customized or default category permalink base ( example.com/xx/tagname ).
+         *
+         * @since 1.5.0
+         * @access private
+         * @var string
+         */
+        var $category_base;
+
+        /**
+         * Customized or default tag permalink base ( example.com/xx/tagname ).
+         *
+         * @since 2.3.0
+         * @access private
+         * @var string
+         */
+        var $tag_base;
+
+        /**
+         * Permalink request structure for categories.
+         *
+         * @since 1.5.0
+         * @access private
+         * @var string
+         */
+        var $category_structure;
+
+        /**
+         * Permalink request structure for tags.
+         *
+         * @since 2.3.0
+         * @access private
+         * @var string
+         */
+        var $tag_structure;
+
+        /**
          * Permalink author request base ( example.com/author/authorname ).
          *
@@ -436 +479 @@
          */
         var $comments_base = 'comments';
-
-        /**
-         * Pagination permalink base.
-         *
-         * @since 3.1.0
-         * @access private
-         * @var string
-         */
-        var $pagination_base = 'page';
 
         /**
@@ -571 +605 @@
          * Endpoints permalinks
          *
-         * @since 2.1.0
+         * @since unknown
          * @access private
          * @var array
@@ -615 +649 @@
                                         '%postname%',
                                         '%post_id%',
+                                        '%category%',
+                                        '%tag%',
                                         '%author%',
                                         '%pagename%',
@@ -637 +673 @@
                                         '([^/]+)',
                                         '([0-9]+)',
+                                        '(.+?)',
+                                        '(.+?)',
                                         '([^/]+)',
                                         '([^/]+?)',
@@ -659 +697 @@
                                         'name=',
                                         'p=',
+                                        'category_name=',
+                                        'tag=',
                                         'author_name=',
                                         'pagename=',
@@ -980 +1020 @@
          */
         function get_category_permastruct() {
-                return $this->get_extra_permastruct('category');
+                if ( isset($this->category_structure) )
+                        return $this->category_structure;
+
+                if ( empty($this->permalink_structure) ) {
+                        $this->category_structure = '';
+                        return false;
+                }
+
+                if ( empty($this->category_base) )
+                        $this->category_structure = trailingslashit( $this->front . 'category' );
+                else
+                        $this->category_structure = trailingslashit( '/' . $this->root . $this->category_base );
+
+                $this->category_structure .= '%category%';
+
+                return $this->category_structure;
         }
 
@@ -997 +1052 @@
          */
         function get_tag_permastruct() {
-                return $this->get_extra_permastruct('post_tag');
+                if ( isset($this->tag_structure) )
+                        return $this->tag_structure;
+
+                if ( empty($this->permalink_structure) ) {
+                        $this->tag_structure = '';
+                        return false;
+                }
+
+                if ( empty($this->tag_base) )
+                        $this->tag_structure = trailingslashit( $this->front . 'tag' );
+                else
+                        $this->tag_structure = trailingslashit( '/' . $this->root . $this->tag_base );
+
+                $this->tag_structure .= '%tag%';
+
+                return $this->tag_structure;
         }
 
@@ -1003 +1073 @@
          * Retrieve extra permalink structure by name.
          *
-         * @since 2.5.0
+         * @since unknown
          * @access public
          *
@@ -1210 +1280 @@
                 //build a regex to match the trackback and page/xx parts of URLs
                 $trackbackregex = 'trackback/?$';
-                $pageregex = $this->pagination_base . '/?([0-9]{1,})/?$';
+                $pageregex = 'page/?([0-9]{1,})/?$';
                 $commentregex = 'comment-page-([0-9]{1,})/?$';
 
@@ -1535 +1605 @@
                 $search_rewrite = apply_filters('search_rewrite_rules', $search_rewrite);
 
+                // Categories
+                $category_rewrite = $this->generate_rewrite_rules($this->get_category_permastruct(), EP_CATEGORIES);
+                $category_rewrite = apply_filters('category_rewrite_rules', $category_rewrite);
+
+                // Tags
+                $tag_rewrite = $this->generate_rewrite_rules($this->get_tag_permastruct(), EP_TAGS);
+                $tag_rewrite = apply_filters('tag_rewrite_rules', $tag_rewrite);
+
                 // Authors
                 $author_rewrite = $this->generate_rewrite_rules($this->get_author_permastruct(), EP_AUTHORS);
@@ -1544 +1622 @@
 
                 // Extra permastructs
-                foreach ( $this->extra_permastructs as $permastructname => $permastruct ) {
+                foreach ( $this->extra_permastructs as $permastruct ) {
                         if ( is_array($permastruct) )
-                                $rules = $this->generate_rewrite_rules($permastruct[0], $permastruct[1]);
+                                $this->extra_rules_top = array_merge($this->extra_rules_top, $this->generate_rewrite_rules($permastruct[0], $permastruct[1]));
                         else
-                                $rules = $this->generate_rewrite_rules($permastruct, EP_NONE);
-
-                        $rules = apply_filters($permastructname . '_rewrite_rules', $rules);
-                        if ( 'post_tag' == $permastructname )
-                                $rules = apply_filters('tag_rewrite_rules', $rules);
-
-                        $this->extra_rules_top = array_merge($this->extra_rules_top, $rules);
+                                $this->extra_rules_top = array_merge($this->extra_rules_top, $this->generate_rewrite_rules($permastruct, EP_NONE));
                 }
 
                 // Put them together.
                 if ( $this->use_verbose_page_rules )
-                        $this->rules = array_merge($this->extra_rules_top, $robots_rewrite, $default_feeds, $registration_pages, $page_rewrite, $root_rewrite, $comments_rewrite, $search_rewrite,  $author_rewrite, $date_rewrite, $post_rewrite, $this->extra_rules);
+                        $this->rules = array_merge($this->extra_rules_top, $robots_rewrite, $default_feeds, $registration_pages, $page_rewrite, $root_rewrite, $comments_rewrite, $search_rewrite, $category_rewrite, $tag_rewrite, $author_rewrite, $date_rewrite, $post_rewrite, $this->extra_rules);
                 else
-                        $this->rules = array_merge($this->extra_rules_top, $robots_rewrite, $default_feeds, $registration_pages, $root_rewrite, $comments_rewrite, $search_rewrite,  $author_rewrite, $date_rewrite, $post_rewrite, $page_rewrite, $this->extra_rules);
+                        $this->rules = array_merge($this->extra_rules_top, $robots_rewrite, $default_feeds, $registration_pages, $root_rewrite, $comments_rewrite, $search_rewrite, $category_rewrite, $tag_rewrite, $author_rewrite, $date_rewrite, $post_rewrite, $page_rewrite, $this->extra_rules);
 
                 do_action_ref_array('generate_rewrite_rules', array(&$this));
@@ -1848 +1920 @@
          * top.
          *
-         * @since 2.5.0
+         * @since unknown
          * @access public
          *
@@ -1870 +1942 @@
          * @since 2.0.1
          * @access public
-         * @param bool $hard Whether to update .htaccess (hard flush) or just update rewrite_rules option (soft flush). Default is true (hard).
+         * @param $hard bool Whether to update .htaccess (hard flush) or just update rewrite_rules option (soft flush). Default is true (hard).
          */
         function flush_rules($hard = true) {
@@ -1898 +1970 @@
                 if ( $this->using_index_permalinks() )
                         $this->root = $this->index . '/';
+                $this->category_base = get_option( 'category_base' );
+                $this->tag_base = get_option( 'tag_base' );
+                unset($this->category_structure);
                 unset($this->author_structure);
                 unset($this->date_structure);
@@ -1949 +2024 @@
          */
         function set_category_base($category_base) {
-                if ( $category_base != get_option('category_base') ) {
+                if ( $category_base != $this->category_base ) {
                         update_option('category_base', $category_base);
                         $this->init();
@@ -1968 +2043 @@
          */
         function set_tag_base( $tag_base ) {
-                if ( $tag_base != get_option( 'tag_base') ) {
+                if ( $tag_base != $this->tag_base ) {
                         update_option( 'tag_base', $tag_base );
                         $this->init();