WordPress 4.2.4-scripts

[autoinstalls/wordpress.git] / wp-includes / rewrite.php

diff --git a/wp-includes/rewrite.php b/wp-includes/rewrite.php
index 9bc167f08f4b630aeb98fa733b91f58fc367850a..45d28cea97a072773e0c25cf08299b67068bcbf2 100644 (file)
--- a/wp-includes/rewrite.php
+++ b/wp-includes/rewrite.php
@@ -420,19 +420,17 @@ class WP_Rewrite {
         * Permalink structure for posts.
         *
         * @since 1.5.0
-        * @access private
         * @var string
         */
-       var $permalink_structure;
+       public $permalink_structure;
 
        /**
         * Whether to add trailing slashes.
         *
         * @since 2.2.0
-        * @access private
         * @var bool
         */
-       var $use_trailing_slashes;
+       public $use_trailing_slashes;
 
        /**
         * Base for the author permalink structure (example.com/$author_base/authorname).
@@ -501,10 +499,18 @@ class WP_Rewrite {
         * Pagination permalink base.
         *
         * @since 3.1.0
+        * @var string
+        */
+       public $pagination_base = 'page';
+
+       /**
+        * Comments pagination permalink base.
+        *
+        * @since 4.2.0
         * @access private
         * @var string
         */
-       var $pagination_base = 'page';
+       var $comments_pagination_base = 'comment-page';
 
        /**
         * Feed permalink base.
@@ -522,7 +528,7 @@ class WP_Rewrite {
         * @access private
         * @var string
         */
-       var $comments_feed_structure;
+       var $comment_feed_structure;
 
        /**
         * Feed request permalink structure.
@@ -542,10 +548,9 @@ class WP_Rewrite {
         *
         * @see WP_Rewrite::init()
         * @since 1.5.0
-        * @access private
         * @var string
         */
-       var $front;
+       public $front;
 
        /**
         * The prefix for all permalink structures.
@@ -557,10 +562,9 @@ class WP_Rewrite {
         * @see WP_Rewrite::init()
         * @see WP_Rewrite::using_index_permalinks()
         * @since 1.5.0
-        * @access private
         * @var string
         */
-       var $root = '';
+       public $root = '';
 
        /**
         * The name of the index file which is the entry point to all requests.
@@ -746,10 +750,9 @@ class WP_Rewrite {
         * Supported default feeds.
         *
         * @since 1.5.0
-        * @access private
         * @var array
         */
-       var $feeds = array( 'feed', 'rdf', 'rss', 'rss2', 'atom' );
+       public $feeds = array( 'feed', 'rdf', 'rss', 'rss2', 'atom' );
 
        /**
         * Whether permalinks are being used.
@@ -1262,7 +1265,7 @@ class WP_Rewrite {
                //build a regex to match the trackback and page/xx parts of URLs
                $trackbackregex = 'trackback/?$';
                $pageregex = $this->pagination_base . '/?([0-9]{1,})/?$';
-               $commentregex = 'comment-page-([0-9]{1,})/?$';
+               $commentregex = $this->comments_pagination_base . '-([0-9]{1,})/?$';
 
                //build up an array of endpoint regexes to append => queries to append
                if ( $endpoints ) {
@@ -1288,6 +1291,7 @@ class WP_Rewrite {
                $trackbackindex = $index;
                //build a list from the rewritecode and queryreplace arrays, that will look something like
                //tagname=$matches[i] where i is the current $i
+               $queries = array();
                for ( $i = 0; $i < $num_tokens; ++$i ) {
                        if ( 0 < $i )
                                $queries[$i] = $queries[$i - 1] . '&';
@@ -1328,7 +1332,7 @@ class WP_Rewrite {
                        $num_toks = preg_match_all('/%.+?%/', $struct, $toks);
 
                        //get the 'tagname=$matches[i]'
-                       $query = ( isset($queries) && is_array($queries) && !empty($num_toks) ) ? $queries[$num_toks - 1] : '';
+                       $query = ( ! empty( $num_toks ) && isset( $queries[$num_toks - 1] ) ) ? $queries[$num_toks - 1] : '';
 
                        //set up $ep_mask_specific which is used to match more specific URL types
                        switch ( $dirs[$j] ) {
@@ -1381,11 +1385,11 @@ class WP_Rewrite {
                                $rewrite = array_merge($rewrite, array($pagematch => $pagequery));
 
                        //only on pages with comments add ../comment-page-xx/
-                       if ( EP_PAGES & $ep_mask || EP_PERMALINK & $ep_mask )
+                       if ( EP_PAGES & $ep_mask || EP_PERMALINK & $ep_mask ) {
                                $rewrite = array_merge($rewrite, array($commentmatch => $commentquery));
-                       else if ( EP_ROOT & $ep_mask && get_option('page_on_front') )
+                       } elseif ( EP_ROOT & $ep_mask && get_option('page_on_front') ) {
                                $rewrite = array_merge($rewrite, array($rootcommentmatch => $rootcommentquery));
-
+                       }
                        //do endpoints
                        if ( $endpoints ) {
                                foreach ( (array) $ep_query_append as $regex => $ep) {
@@ -2040,7 +2044,21 @@ class WP_Rewrite {
         * @access public
         * @param bool $hard Whether to update .htaccess (hard flush) or just update rewrite_rules option (soft flush). Default is true (hard).
         */
-       public function flush_rules($hard = true) {
+       public function flush_rules( $hard = true ) {
+               static $do_hard_later;
+
+               // Prevent this action from running before everyone has registered their rewrites
+               if ( ! did_action( 'wp_loaded' ) ) {
+                       add_action( 'wp_loaded', array( $this, 'flush_rules' ) );
+                       $do_hard_later = ( isset( $do_hard_later ) ) ? $do_hard_later || $hard : $hard;
+                       return;
+               }
+
+               if ( isset( $do_hard_later ) ) {
+                       $hard = $do_hard_later;
+                       unset( $do_hard_later );
+               }
+
                delete_option('rewrite_rules');
                $this->wp_rewrite_rules();
                /**
@@ -2170,7 +2188,6 @@ class WP_Rewrite {
         * @since 1.5.0
         * @access public
         *
-        * @return WP_Rewrite
         */
        public function __construct() {
                $this->init();