Changeset 21819

Timestamp:

09/11/2012 08:15:56 PM (12 years ago)

Author:

nacin

Message:

Remove accidental cruft in [21804] caused by renaming variables. see #21509.

File:

• trunk/wp-includes/rewrite.php (modified) (1 diff)

trunk/wp-includes/rewrite.php

@@ -1589 +1589 @@
         // Put them together.
         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
-            $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));