#795114 budda, alex_b: Taxonomy term processor doesn't require vocabulary to be set.

CHANGELOG.txt

 // $Id$
 
+Feeds 6.x xxxxxxxxxxxxxxxxxxxxxx
+--------------------------------
+
+- #795114 budda, alex_b: Taxonomy term processor doesn't require vocabulary to
+  be set.
+
 Feeds 6.x 1.0 Beta 5, 2010-09-10
 --------------------------------
 

plugins/FeedsTermProcessor.inc

@@ -118,7 +118,9 @@ class FeedsTermProcessor extends FeedsProcessor {
     if (!$target_term) {
       $target_term = array();
     }
-    $vocabulary = $this->vocabulary();
+    if (!$vocabulary = $this->vocabulary()) {
+      throw new Exception(t('No vocabulary specified for term processor.'));
+    }
     $target_term['vid'] = $vocabulary->vid;
     $target_term = parent::map($batch, $target_term);
     // Taxonomy module expects synonyms to be supplied as a single string.
@@ -174,6 +176,15 @@ class FeedsTermProcessor extends FeedsProcessor {
     return $form;
   }
 
+  /**
+   * Override parent::configFormValidate().
+   */
+  public function configFormValidate(&$values) {
+    if (empty($values['vocabulary'])) {
+      form_set_error('vocabulary', t('Choose a vocabulary'));
+    }
+  }
+
   /**
    * Return available mapping targets.
    */