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

File:

• trunk/wp-includes/rewrite.php (modified) (27 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()) when your plugin gets
+ * Be sure to flush the rewrite rules (wp_rewrite->flush_rules()) 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
@@ -300 +295 @@
         // Chop off /path/to/blog
         $home_path = parse_url(home_url());
-        $home_path = $home_path['path'];
+        $home_path = isset( $home_path['path'] ) ? $home_path['path'] : '' ;
         $url = str_replace($home_path, '', $url);
     }
@@ -308 +303 @@
 
     $request = $url;
-
-    // Done with cleanup
 
     // Look for matches.
@@ -338 +331 @@
             // Do the query
             $query = new WP_Query($query);
-            if ( $query->is_single || $query->is_page )
+            if ( !empty($query->posts) && $query->is_singular )
                 return $query->post->ID;
             else
@@ -382 +375 @@
 
     /**
-     * Customized or default category permalink base ( example.com/xx/tagname ).
+     * Permalink author request base ( example.com/author/authorname ).
      *
      * @since 1.5.0
@@ -388 +381 @@
      * @var string
      */
-    var $category_base;
-
-    /**
-     * Customized or default tag permalink base ( example.com/xx/tagname ).
-     *
-     * @since 2.3.0
+    var $author_base = 'author';
+
+    /**
+     * Permalink request structure for author pages.
+     *
+     * @since 1.5.0
      * @access private
      * @var string
      */
-    var $tag_base;
-
-    /**
-     * Permalink request structure for categories.
+    var $author_structure;
+
+    /**
+     * Permalink request structure for dates.
      *
      * @since 1.5.0
@@ -406 +399 @@
      * @var string
      */
-    var $category_structure;
-
-    /**
-     * Permalink request structure for tags.
-     *
-     * @since 2.3.0
+    var $date_structure;
+
+    /**
+     * Permalink request structure for pages.
+     *
+     * @since 1.5.0
      * @access private
      * @var string
      */
-    var $tag_structure;
-
-    /**
-     * Permalink author request base ( example.com/author/authorname ).
+    var $page_structure;
+
+    /**
+     * Search permalink base ( example.com/search/query ).
      *
      * @since 1.5.0
@@ -424 +417 @@
      * @var string
      */
-    var $author_base = 'author';
-
-    /**
-     * Permalink request structure for author pages.
+    var $search_base = 'search';
+
+    /**
+     * Permalink request structure for searches.
      *
      * @since 1.5.0
@@ -433 +426 @@
      * @var string
      */
-    var $author_structure;
-
-    /**
-     * Permalink request structure for dates.
+    var $search_structure;
+
+    /**
+     * Comments permalink base.
      *
      * @since 1.5.0
@@ -442 +435 @@
      * @var string
      */
-    var $date_structure;
-
-    /**
-     * Permalink request structure for pages.
-     *
-     * @since 1.5.0
+    var $comments_base = 'comments';
+
+    /**
+     * Pagination permalink base.
+     *
+     * @since 3.1.0
      * @access private
      * @var string
      */
-    var $page_structure;
-
-    /**
-     * Search permalink base ( example.com/search/query ).
-     *
-     * @since 1.5.0
-     * @access private
-     * @var string
-     */
-    var $search_base = 'search';
-
-    /**
-     * Permalink request structure for searches.
-     *
-     * @since 1.5.0
-     * @access private
-     * @var string
-     */
-    var $search_structure;
-
-    /**
-     * Comments permalink base.
-     *
-     * @since 1.5.0
-     * @access private
-     * @var string
-     */
-    var $comments_base = 'comments';
+    var $pagination_base = 'page';
 
     /**
@@ -605 +571 @@
      * Endpoints permalinks
      *
-     * @since unknown
+     * @since 2.1.0
      * @access private
      * @var array
@@ -649 +615 @@
                     '%postname%',
                     '%post_id%',
-                    '%category%',
-                    '%tag%',
                     '%author%',
                     '%pagename%',
@@ -673 +637 @@
                     '([^/]+)',
                     '([0-9]+)',
-                    '(.+?)',
-                    '(.+?)',
                     '([^/]+)',
                     '([^/]+?)',
@@ -697 +659 @@
                     'name=',
                     'p=',
-                    'category_name=',
-                    'tag=',
                     'author_name=',
                     'pagename=',
@@ -1020 +980 @@
      */
     function get_category_permastruct() {
-        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;
+        return $this->get_extra_permastruct('category');
     }
 
@@ -1052 +997 @@
      */
     function get_tag_permastruct() {
-        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;
+        return $this->get_extra_permastruct('post_tag');
     }
 
@@ -1073 +1003 @@
      * Retrieve extra permalink structure by name.
      *
-     * @since unknown
+     * @since 2.5.0
      * @access public
      *
@@ -1280 +1210 @@
         //build a regex to match the trackback and page/xx parts of URLs
         $trackbackregex = 'trackback/?$';
-        $pageregex = 'page/?([0-9]{1,})/?$';
+        $pageregex = $this->pagination_base . '/?([0-9]{1,})/?$';
         $commentregex = 'comment-page-([0-9]{1,})/?$';
 
@@ -1605 +1535 @@
         $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);
@@ -1622 +1544 @@
 
         // Extra permastructs
-        foreach ( $this->extra_permastructs as $permastruct ) {
+        foreach ( $this->extra_permastructs as $permastructname => $permastruct ) {
             if ( is_array($permastruct) )
-                $this->extra_rules_top = array_merge($this->extra_rules_top, $this->generate_rewrite_rules($permastruct[0], $permastruct[1]));
+                $rules = $this->generate_rewrite_rules($permastruct[0], $permastruct[1]);
             else
-                $this->extra_rules_top = array_merge($this->extra_rules_top, $this->generate_rewrite_rules($permastruct, EP_NONE));
+                $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);
         }
 
         // 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, $category_rewrite, $tag_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,  $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, $category_rewrite, $tag_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,  $author_rewrite, $date_rewrite, $post_rewrite, $page_rewrite, $this->extra_rules);
 
         do_action_ref_array('generate_rewrite_rules', array(&$this));
@@ -1920 +1848 @@
      * top.
      *
-     * @since unknown
+     * @since 2.5.0
      * @access public
      *
@@ -1942 +1870 @@
      * @since 2.0.1
      * @access public
-     * @param $hard bool Whether to update .htaccess (hard flush) or just update rewrite_rules option (soft flush). Default is true (hard).
+     * @param bool $hard Whether to update .htaccess (hard flush) or just update rewrite_rules option (soft flush). Default is true (hard).
      */
     function flush_rules($hard = true) {
@@ -1970 +1898 @@
         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);
@@ -2024 +1949 @@
      */
     function set_category_base($category_base) {
-        if ( $category_base != $this->category_base ) {
+        if ( $category_base != get_option('category_base') ) {
             update_option('category_base', $category_base);
             $this->init();
@@ -2043 +1968 @@
      */
     function set_tag_base( $tag_base ) {
-        if ( $tag_base != $this->tag_base ) {
+        if ( $tag_base != get_option( 'tag_base') ) {
             update_option( 'tag_base', $tag_base );
             $this->init();