Remove accidental cruft in [21804] caused by renaming variables. see #21509.
git-svn-id: https://develop.svn.wordpress.org/trunk@21819 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
dfac91464f
commit
9c322a7270
|
@ -1588,9 +1588,9 @@ class WP_Rewrite {
|
||||||
|
|
||||||
// Put them together.
|
// Put them together.
|
||||||
if ( $this->use_verbose_page_rules )
|
if ( $this->use_verbose_page_rules )
|
||||||
$this->rules = array_merge($this->extra_rules_top, $robots_rewrite, $deprecated_files, $old_service_files, $registration_pages, $root_rewrite, $comments_rewrite, $search_rewrite, $author_rewrite, $date_rewrite, $page_rewrite, $post_rewrite, $this->extra_rules);
|
$this->rules = array_merge($this->extra_rules_top, $robots_rewrite, $deprecated_files, $registration_pages, $root_rewrite, $comments_rewrite, $search_rewrite, $author_rewrite, $date_rewrite, $page_rewrite, $post_rewrite, $this->extra_rules);
|
||||||
else
|
else
|
||||||
$this->rules = array_merge($this->extra_rules_top, $robots_rewrite, $deprecated_files, $old_service_files, $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, $deprecated_files, $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));
|
do_action_ref_array('generate_rewrite_rules', array(&$this));
|
||||||
$this->rules = apply_filters('rewrite_rules_array', $this->rules);
|
$this->rules = apply_filters('rewrite_rules_array', $this->rules);
|
||||||
|
|
Loading…
Reference in New Issue