Changeset 8572 for trunk/wp-includes/rewrite.php

Timestamp:

08/06/2008 08:31:54 PM (16 years ago)

Author:

markjaquith

Message:

Cast to array when using foreach(). Props santosj (and thanks for your perseverance!). fixes #2784

File:

• trunk/wp-includes/rewrite.php (modified) (8 diffs)

trunk/wp-includes/rewrite.php

@@ -158 +158 @@
             parse_str($query, $query_vars);
             $query = array();
-            foreach ( $query_vars as $key => $value ) {
+            foreach ( (array) $query_vars as $key => $value ) {
                 if ( in_array($key, $wp->public_query_vars) )
                     $query[$key] = $value;
@@ -391 +391 @@
         preg_match_all('/%.+?%/', $this->permalink_structure, $tokens);
         $tok_index = 1;
-        foreach ($tokens[0] as $token) {
+        foreach ( (array) $tokens[0] as $token) {
             if ( ($token == '%post_id%') && ($tok_index <= 3) ) {
                 $front = $front . 'date/';
@@ -575 +575 @@
         //build a regex to match the feed section of URLs, something like (feed|atom|rss|rss2)/?
         $feedregex2 = '';
-        foreach ($this->feeds as $feed_name) {
+        foreach ( (array) $this->feeds as $feed_name) {
             $feedregex2 .= $feed_name . '|';
         }
@@ -590 +590 @@
         if ($endpoints) {
             $ep_query_append = array ();
-            foreach ($this->endpoints as $endpoint) {
+            foreach ( (array) $this->endpoints as $endpoint) {
                 //match everything after the endpoint name, but allow for nothing to appear there
                 $epmatch = $endpoint[1] . '(/(.*))?/?$';
@@ -689 +689 @@
             //do endpoints
             if ($endpoints) {
-                foreach ($ep_query_append as $regex => $ep) {
+                foreach ( (array) $ep_query_append as $regex => $ep) {
                     //add the endpoints on if the mask fits
                     if ($ep[0] & $ep_mask || $ep[0] & $ep_mask_specific) {
@@ -746 +746 @@
 
                     //do endpoints for attachments
-                    if (! empty($endpoint) ) { foreach ($ep_query_append as $regex => $ep) {
+                    if ( !empty($endpoint) ) { foreach ( (array) $ep_query_append as $regex => $ep ) {
                         if ($ep[0] & EP_ATTACHMENT) {
                             $rewrite[$sub1 . $regex] = $subquery . '?' . $ep[1] . $this->preg_index(2);
@@ -894 +894 @@
 
         //add in the rules that don't redirect to WP's index.php (and thus shouldn't be handled by WP at all)
-        foreach ($this->non_wp_rules as $match => $query) {
+        foreach ( (array) $this->non_wp_rules as $match => $query) {
             // Apache 1.3 does not support the reluctant (non-greedy) modifier.
             $match = str_replace('.+?', '.+', $match);
@@ -915 +915 @@
                 "RewriteRule ^.*$ - [S=$num_rules]\n";
 
-            foreach ($rewrite as $match => $query) {
+            foreach ( (array) $rewrite as $match => $query) {
                 // Apache 1.3 does not support the reluctant (non-greedy) modifier.
                 $match = str_replace('.+?', '.+', $match);