1 files changed, 4 insertions, 2 deletions
diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module
index 7c6889c03..1db756458 100644
--- a/modules/taxonomy/taxonomy.module
+++ b/modules/taxonomy/taxonomy.module
@@ -1639,8 +1639,10 @@ function taxonomy_node_validate($node, $form) {
  */
 function taxonomy_node_update_index($node) {
   $output = array();
-  foreach ($node->taxonomy as $term) {
-    $output[] = $term->name;
+  if (isset($node->taxonomy) && is_array($node->taxonomy)) {
+    foreach ($node->taxonomy as $term) {
+      $output[] = $term->name;
+    }
   }
   if (count($output)) {
     return '<strong>(' . implode(', ', $output) . ')</strong>';