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

trunk/wp-includes/widgets.php

@@ -209 +209 @@
     } else {
         $index = sanitize_title($index);
-        foreach ( $wp_registered_sidebars as $key => $value ) {
+        foreach ( (array) $wp_registered_sidebars as $key => $value ) {
             if ( sanitize_title($value['name']) == $index ) {
                 $index = $key;
@@ -225 +225 @@
 
     $did_one = false;
-    foreach ( $sidebars_widgets[$index] as $id ) {
+    foreach ( (array) $sidebars_widgets[$index] as $id ) {
         $params = array_merge(
             array( array_merge( $sidebar, array('widget_id' => $id, 'widget_name' => $wp_registered_widgets[$id]['name']) ) ),
@@ -275 +275 @@
     global $wp_registered_widgets, $wp_registered_sidebars;
     $sidebars_widgets = get_option('sidebars_widgets');
-    foreach ( $wp_registered_sidebars as $index => $sidebar ) {
+    foreach ( (array) $wp_registered_sidebars as $index => $sidebar ) {
         if ( count($sidebars_widgets[$index]) ) {
-            foreach ( $sidebars_widgets[$index] as $widget )
+            foreach ( (array) $sidebars_widgets[$index] as $widget )
                 if ( array_key_exists($widget, $wp_registered_widgets) )
                     return true;
@@ -298 +298 @@
     switch ( $sidebars_widgets['array_version'] ) {
         case 1 :
-            foreach ( $sidebars_widgets as $index => $sidebar )
+            foreach ( (array) $sidebars_widgets as $index => $sidebar )
             if ( is_array($sidebar) )
-            foreach ( $sidebar as $i => $name ) {
+            foreach ( (array) $sidebar as $i => $name ) {
                 $id = strtolower($name);
                 if ( isset($wp_registered_widgets[$id]) ) {
@@ -339 +339 @@
             if ( !empty( $sidebars ) ) {
                 // Move the known-good ones first
-                foreach ( $sidebars as $id ) {
+                foreach ( (array) $sidebars as $id ) {
                     if ( array_key_exists( $id, $sidebars_widgets ) ) {
                         $_sidebars_widgets[$id] = $sidebars_widgets[$id];
@@ -374 +374 @@
     $defaults = array();
 
-    foreach ( $wp_registered_sidebars as $index => $sidebar )
+    foreach ( (array) $wp_registered_sidebars as $index => $sidebar )
         $defaults[$index] = array();
 
@@ -636 +636 @@
             $this_sidebar = array();
 
-        foreach ( $this_sidebar as $_widget_id ) {
+        foreach ( (array) $this_sidebar as $_widget_id ) {
             if ( 'wp_widget_text' == $wp_registered_widgets[$_widget_id]['callback'] && isset($wp_registered_widgets[$_widget_id]['params'][0]['number']) ) {
                 $widget_number = $wp_registered_widgets[$_widget_id]['params'][0]['number'];
@@ -684 +684 @@
 
     $id = false;
-    foreach ( array_keys($options) as $o ) {
+    foreach ( (array) array_keys($options) as $o ) {
         // Old widgets can have null values for some reason
         if ( !isset($options[$o]['title']) || !isset($options[$o]['text']) )
@@ -730 +730 @@
 <script type='text/javascript'>
 /* <![CDATA[ */
-    var dropdown = document.getElementById("cat");
-    function onCatChange() {
+    var dropdown = document.getElementById("cat");
+    function onCatChange() {
         if ( dropdown.options[dropdown.selectedIndex].value > 0 ) {
             location.href = "<?php echo get_option('home'); ?>/?cat="+dropdown.options[dropdown.selectedIndex].value;
         }
-    }
-    dropdown.onchange = onCatChange;
+    }
+    dropdown.onchange = onCatChange;
 /* ]]> */
 </script>
@@ -778 +778 @@
             $this_sidebar = array();
 
-        foreach ( $this_sidebar as $_widget_id ) {
+        foreach ( (array) $this_sidebar as $_widget_id ) {
             if ( 'wp_widget_categories' == $wp_registered_widgets[$_widget_id]['callback'] && isset($wp_registered_widgets[$_widget_id]['params'][0]['number']) ) {
                 $widget_number = $wp_registered_widgets[$_widget_id]['params'][0]['number'];
@@ -853 +853 @@
 
     $id = false;
-    foreach ( array_keys($options) as $o ) {
+    foreach ( (array) array_keys($options) as $o ) {
         // Old widgets can have null values for some reason
         if ( !isset($options[$o]['title']) )
@@ -987 +987 @@
             <?php echo $before_title . $title . $after_title; ?>
             <ul id="recentcomments"><?php
-            if ( $comments ) : foreach ($comments as $comment) :
+            if ( $comments ) : foreach ( (array) $comments as $comment) :
             echo  '<li class="recentcomments">' . sprintf(__('%1$s on %2$s'), get_comment_author_link(), '<a href="'. get_permalink($comment->comment_post_ID) . '#comment-' . $comment->comment_ID . '">' . get_the_title($comment->comment_post_ID) . '</a>') . '</li>';
             endforeach; endif;?></ul>
@@ -1118 +1118 @@
         $rss->items = array_slice($rss->items, 0, $items);
         echo '<ul>';
-        foreach ($rss->items as $item ) {
+        foreach ( (array) $rss->items as $item ) {
             while ( strstr($item['link'], 'http') != $item['link'] )
                 $item['link'] = substr($item['link'], 1);
@@ -1185 +1185 @@
 
     $urls = array();
-    foreach ( $options as $option )
+    foreach ( (array) $options as $option )
         if ( isset($option['url']) )
             $urls[$option['url']] = true;
@@ -1198 +1198 @@
             $this_sidebar = array();
 
-        foreach ( $this_sidebar as $_widget_id ) {
+        foreach ( (array) $this_sidebar as $_widget_id ) {
             if ( 'wp_widget_rss' == $wp_registered_widgets[$_widget_id]['callback'] && isset($wp_registered_widgets[$_widget_id]['params'][0]['number']) ) {
                 $widget_number = $wp_registered_widgets[$_widget_id]['params'][0]['number'];
@@ -1343 +1343 @@
 
     $id = false;
-    foreach ( array_keys($options) as $o ) {
+    foreach ( (array) array_keys($options) as $o ) {
         // Old widgets can have null values for some reason
         if ( !isset($options[$o]['url']) || !isset($options[$o]['title']) || !isset($options[$o]['items']) )