WordPress 4.7

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

diff --git a/wp-includes/class-wp-rewrite.php b/wp-includes/class-wp-rewrite.php
index 2c5761566d2c3ac17985b5ea5d6242554ee44abc..17c58b90a878805535a18c27acbfeab04aacbb78 100644 (file)
--- a/wp-includes/class-wp-rewrite.php
+++ b/wp-includes/class-wp-rewrite.php
@@ -1413,7 +1413,7 @@ class WP_Rewrite {
                         *
                         * @param array $rules The rewrite rules generated for the current permastruct.
                         */
-                       $rules = apply_filters( $permastructname . '_rewrite_rules', $rules );
+                       $rules = apply_filters( "{$permastructname}_rewrite_rules", $rules );
                        if ( 'post_tag' == $permastructname ) {
 
                                /**
@@ -1475,6 +1475,10 @@ class WP_Rewrite {
                if ( empty($this->rules) ) {
                        $this->matches = 'matches';
                        $this->rewrite_rules();
+                       if ( ! did_action( 'wp_loaded' ) ) {
+                               add_action( 'wp_loaded', array( $this, 'flush_rules' ) );
+                               return $this->rules;
+                       }
                        update_option('rewrite_rules', $this->rules);
                }