Ticket #14991: 14991.2.diff

File 14991.2.diff, 967 bytes (added by prettyboymp, 3 years ago)

made sure top rules stayed first

Line 
1Index: wp-includes/rewrite.php
2===================================================================
3--- wp-includes/rewrite.php     (revision 15674)
4+++ wp-includes/rewrite.php     (working copy)
5@@ -1632,9 +1632,9 @@
6                // Extra permastructs
7                foreach ( $this->extra_permastructs as $permastruct ) {
8                        if ( is_array($permastruct) )
9-                               $this->extra_rules_top = array_merge($this->extra_rules_top, $this->generate_rewrite_rules($permastruct[0], $permastruct[1]));
10+                               $this->extra_rules_top = array_reverse( array_merge( array_reverse( $this->generate_rewrite_rules( $permastruct[0], $permastruct[1] ) ), array_reverse( $this->extra_rules_top ) ) );
11                        else
12-                               $this->extra_rules_top = array_merge($this->extra_rules_top, $this->generate_rewrite_rules($permastruct, EP_NONE));
13+                               $this->extra_rules_top = array_reverse( array_merge( $this->generate_rewrite_rules( $permastruct, EP_NONE ) ), array_reverse( $this->extra_rules_top ) );
14                }
15 
16                // Put them together.