Changeset 8572 for trunk/wp-includes/classes.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/classes.php (modified) (9 diffs)

trunk/wp-includes/classes.php

@@ -91 +91 @@
             // Look for matches.
             $request_match = $request;
-            foreach ($rewrite as $match => $query) {
+            foreach ( (array) $rewrite as $match => $query) {
                 // Don't try to match against AtomPub calls
                 if ( $req_uri == 'wp-app.php' )
@@ -172 +172 @@
         }
 
-        foreach ($this->private_query_vars as $var) {
+        foreach ( (array) $this->private_query_vars as $var) {
             if (isset($this->extra_query_vars[$var]))
                 $this->query_vars[$var] = $this->extra_query_vars[$var];
@@ -243 +243 @@
     function build_query_string() {
         $this->query_string = '';
-        foreach (array_keys($this->query_vars) as $wpvar) {
+        foreach ( (array) array_keys($this->query_vars) as $wpvar) {
             if ( '' != $this->query_vars[$wpvar] ) {
                 $this->query_string .= (strlen($this->query_string) < 1) ? '' : '&';
@@ -262 +262 @@
         global $wp_query;
         // Extract updated query vars back into global namespace.
-        foreach ($wp_query->query_vars as $key => $value) {
+        foreach ( (array) $wp_query->query_vars as $key => $value) {
             $GLOBALS[$key] = $value;
         }
@@ -351 +351 @@
         if ( empty($code) ) {
             $all_messages = array();
-            foreach ( $this->errors as $code => $messages )
+            foreach ( (array) $this->errors as $code => $messages )
                 $all_messages = array_merge($all_messages, $messages);
 
@@ -528 +528 @@
         * then we got orphans, which should be displayed regardless
         */
-        if ( ( $max_depth == 0 ) && sizeof( $children_elements ) > 0 ) {
+        if ( ( $max_depth == 0 ) && count( $children_elements ) > 0 ) {
             $empty_array = array();
             foreach ( $children_elements as $orphans )
@@ -751 +751 @@
         $response = '';
         if ( is_wp_error($data) ) {
-            foreach ( $data->get_error_codes() as $code ) {
+            foreach ( (array) $data->get_error_codes() as $code ) {
                 $response .= "<wp_error code='$code'><![CDATA[" . $data->get_error_message($code) . "]]></wp_error>";
                 if ( !$error_data = $data->get_error_data($code) )
@@ -777 +777 @@
 
         $s = '';
-        if ( (array) $supplemental ) {
+        if ( is_array($supplemental) ) {
             foreach ( $supplemental as $k => $v )
                 $s .= "<$k><![CDATA[$v]]></$k>";
@@ -801 +801 @@
         header('Content-Type: text/xml');
         echo "<?xml version='1.0' standalone='yes'?><wp_ajax>";
-        foreach ( $this->responses as $response )
+        foreach ( (array) $this->responses as $response )
             echo $response;
         echo '</wp_ajax>';