Merge branch 'var_fix' into 7.x

thedotwriter · Sep 1, 2011 · 6a1c3ee · 6a1c3ee
2 parents 5daa6ea + 104a58f
commit 6a1c3ee
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/modules/tagging_vocab_suggest/tagging_vocab_suggest.module b/modules/tagging_vocab_suggest/tagging_vocab_suggest.module
@@ -4,14 +4,16 @@
 // Copyright 2010
 
 function tagging_vocab_suggest_tagging_suggestions($vid, $node) {
+  $suggestions = array();
+
   if(strpos(VERSION, '7') === 0) {
     $result  = db_query('select * from {taxonomy_term_data} where vid=:vid', array(':vid' => $vid));
     foreach($result as $term) {
       $suggestions[] = array('#weight' => $term->weight, '#name' => $term->name);
     }
-  } else {
+  }
+  else {
     $result  = db_query('select * from {term_data} where vid=%d', $vid);
-    $suggestions = array();
     while ($term = db_fetch_object($result)) {
       $suggestions[] = array('#weight' => $term->weight, '#name' => $term->name);
     }