Changeset 3472

Timestamp:

01/23/2006 11:20:17 PM (19 years ago)

Author:

ryan

Message:

Use array_append() instead of unions. Props majelbstoat. fixes #2321

File:

• trunk/wp-includes/classes.php (modified) (5 diffs)

trunk/wp-includes/classes.php

@@ -972 +972 @@
             foreach ($attachment_uris as $uri => $pagename) {
                 $this->add_rewrite_tag('%pagename%', "($uri)", 'attachment=');
-                $rewrite_rules += $this->generate_rewrite_rules($page_structure);
+                $rewrite_rules = array_merge($rewrite_rules, $this->generate_rewrite_rules($page_structure));
             }
         }
@@ -978 +978 @@
             foreach ($uris as $uri => $pagename) {
                 $this->add_rewrite_tag('%pagename%', "($uri)", 'pagename=');
-                $rewrite_rules += $this->generate_rewrite_rules($page_structure);
+                $rewrite_rules = array_merge($rewrite_rules, $this->generate_rewrite_rules($page_structure));
             }
         }
@@ -1240 +1240 @@
                 $rewrite = array($feedmatch => $feedquery, $feedmatch2 => $feedquery2);
             if ($paged)
-                $rewrite = $rewrite + array($pagematch => $pagequery);
+                $rewrite = array_merge($rewrite, array($pagematch => $pagequery));
 
             if ($num_toks) {
@@ -1275 +1275 @@
                 }
                         
-                $rewrite = $rewrite + array($match => $query);
+                $rewrite = array_merge($rewrite, array($match => $query));
 
                 if ($post) {
-                    $rewrite = array($trackbackmatch => $trackbackquery) + $rewrite;
+                    $rewrite = array_merge(array($trackbackmatch => $trackbackquery), $rewrite);
                     if ( ! $page )
-                        $rewrite = $rewrite + array($sub1 => $subquery, $sub1tb => $subtbquery, $sub1feed => $subfeedquery, $sub1feed2 => $subfeedquery);
-                    $rewrite = $rewrite + array($sub2 => $subquery, $sub2tb => $subtbquery, $sub2feed => $subfeedquery, $sub2feed2 => $subfeedquery);
-                }
-            }
-
-            $post_rewrite = $rewrite + $post_rewrite;
-        }
-
+                        $rewrite = array_merge($rewrite, array($sub1 => $subquery, $sub1tb => $subtbquery, $sub1feed => $subfeedquery, $sub1feed2 => $subfeedquery));
+                    $rewrite = array_merge($rewrite, array($sub2 => $subquery, $sub2tb => $subtbquery, $sub2feed => $subfeedquery, $sub2feed2 => $subfeedquery));
+                }
+            }
+            $post_rewrite = array_merge($rewrite, $post_rewrite);
+        }
         return $post_rewrite;
     }
@@ -1340 +1338 @@
 
         // Put them together.
-        $this->rules = $page_rewrite + $root_rewrite + $comments_rewrite + $search_rewrite + $category_rewrite + $author_rewrite + $date_rewrite + $post_rewrite;
+        $this->rules = array_merge($page_rewrite, $root_rewrite, $comments_rewrite, $search_rewrite, $category_rewrite, $author_rewrite, $date_rewrite, $post_rewrite);
 
         do_action('generate_rewrite_rules', array(&$this));