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

trunk/wp-includes/taxonomy.php

@@ -50 +50 @@
 
     $taxonomies = array();
-    foreach ( $wp_taxonomies as $taxonomy ) {
+    foreach ( (array) $wp_taxonomies as $taxonomy ) {
         if ( array_intersect($object, (array) $taxonomy->object_type) )
             $taxonomies[] = $taxonomy->name;
@@ -231 +231 @@
         $taxonomies = array($taxonomies);
 
-    foreach ( $taxonomies as $taxonomy ) {
+    foreach ( (array) $taxonomies as $taxonomy ) {
         if ( ! is_taxonomy($taxonomy) )
             return new WP_Error('invalid_taxonomy', __('Invalid Taxonomy'));
@@ -426 +426 @@
     $children = $terms[$term];
 
-    foreach ( $terms[$term] as $child ) {
+    foreach ( (array) $terms[$term] as $child ) {
         if ( isset($terms[$child]) )
             $children = array_merge($children, get_term_children($child, $taxonomy));
@@ -559 +559 @@
     }
 
-    foreach ( $taxonomies as $taxonomy ) {
+    foreach ( (array) $taxonomies as $taxonomy ) {
         if ( ! is_taxonomy($taxonomy) )
             return new WP_Error('invalid_taxonomy', __('Invalid Taxonomy'));
@@ -627 +627 @@
         $interms = preg_split('/[\s,]+/',$include);
         if ( count($interms) ) {
-            foreach ( $interms as $interm ) {
+            foreach ( (array) $interms as $interm ) {
                 if (empty($inclusions))
                     $inclusions = ' AND ( t.term_id = ' . intval($interm) . ' ';
@@ -644 +644 @@
         $exterms = preg_split('/[\s,]+/',$exclude);
         if ( count($exterms) ) {
-            foreach ( $exterms as $exterm ) {
+            foreach ( (array) $exterms as $exterm ) {
                 if (empty($exclusions))
                     $exclusions = ' AND ( t.term_id <> ' . intval($exterm) . ' ';
@@ -722 +722 @@
 
     // Make sure we show empty categories that have children.
-    if ( $hierarchical && $hide_empty ) {
+    if ( $hierarchical && $hide_empty && is_array($terms) ) {
         foreach ( $terms as $k => $term ) {
             if ( ! $term->count ) {
                 $children = _get_term_children($term->term_id, $terms, $taxonomies[0]);
-                foreach ( $children as $child )
-                    if ( $child->count )
-                        continue 2;
+                if( is_array($children) )
+                    foreach ( $children as $child )
+                        if ( $child->count )
+                            continue 2;
 
                 // It really is empty
@@ -825 +826 @@
         $do_object = true;
 
-    foreach ( $fields as $field ) {
+    foreach ( (array) $fields as $field ) {
         if ( $do_object )
             $term->$field = sanitize_term_field($field, $term->$field, $term->term_id, $taxonomy, $context);
@@ -956 +957 @@
         $taxonomies = array($taxonomies);
 
-    foreach ( $taxonomies as $taxonomy ) {
+    foreach ( (array) $taxonomies as $taxonomy ) {
         $terms = wp_get_object_terms($object_id, $taxonomy, 'fields=tt_ids');
         $in_terms = "'" . implode("', '", $terms) . "'";
@@ -1083 +1084 @@
         $taxonomies = array($taxonomies);
 
-    foreach ( $taxonomies as $taxonomy ) {
+    foreach ( (array) $taxonomies as $taxonomy ) {
         if ( ! is_taxonomy($taxonomy) )
             return new WP_Error('invalid_taxonomy', __('Invalid Taxonomy'));
@@ -1324 +1325 @@
     $term_ids = array();
 
-    foreach ($terms as $term) {
+    foreach ( (array) $terms as $term) {
         if ( !strlen(trim($term)) )
             continue;
@@ -1588 +1589 @@
 
     if ( $do_deferred ) {
-        foreach ( array_keys($_deferred) as $tax ) {
+        foreach ( (array) array_keys($_deferred) as $tax ) {
             wp_update_term_count_now( $_deferred[$tax], $tax );
             unset( $_deferred[$tax] );
@@ -1629 +1630 @@
     } else {
         // Default count updater
-        foreach ($terms as $term) {
+        foreach ( (array) $terms as $term) {
             $count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->term_relationships WHERE term_taxonomy_id = %d", $term) );
             $wpdb->update( $wpdb->term_taxonomy, compact( 'count' ), array( 'term_taxonomy_id' => $term ) );
@@ -1822 +1823 @@
  */
 function update_term_cache($terms, $taxonomy = '') {
-    foreach ( $terms as $term ) {
+    foreach ( (array) $terms as $term ) {
         $term_taxonomy = $taxonomy;
         if ( empty($term_taxonomy) )
@@ -1897 +1898 @@
         return $empty_array;
 
-    foreach ( $terms as $term ) {
+    foreach ( (array) $terms as $term ) {
         $use_id = false;
         if ( !is_object($term) ) {
@@ -1957 +1958 @@
     $term_items = array();
 
-    foreach ( $terms as $key => $term ) {
+    foreach ( (array) $terms as $key => $term ) {
         $terms_by_id[$term->term_id] = & $terms[$key];
         $term_ids[$term->term_taxonomy_id] = $term->term_id;
@@ -2007 +2008 @@
     global $wpdb;
 
-    foreach ( $terms as $term ) {
+    foreach ( (array) $terms as $term ) {
         $count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->term_relationships, $wpdb->posts WHERE $wpdb->posts.ID = $wpdb->term_relationships.object_id AND post_status = 'publish' AND post_type = 'post' AND term_taxonomy_id = %d", $term ) );
         $wpdb->update( $wpdb->term_taxonomy, compact( 'count' ), array( 'term_taxonomy_id' => $term ) );