Index: modules/taxonomy/views_handler_filter_term_node_tid.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/taxonomy/views_handler_filter_term_node_tid.inc,v
retrieving revision 1.8.6.11
diff -u -p -r1.8.6.11 views_handler_filter_term_node_tid.inc
--- modules/taxonomy/views_handler_filter_term_node_tid.inc	12 Nov 2010 07:07:08 -0000	1.8.6.11
+++ modules/taxonomy/views_handler_filter_term_node_tid.inc	25 Nov 2010 16:04:36 -0000
@@ -9,7 +9,7 @@ class views_handler_filter_term_node_tid
     parent::init($view, $options);
 
     // Convert legacy vid option to machine name vocabulary.
-    if (!empty($this->options['vid'])) {
+    if (!empty($this->options['vid']) & empty($this->options['vocabulary'])) {
       $vocabularies = taxonomy_get_vocabularies();
       $vid = $this->options['vid'];
       if (isset($vocabularies[$vid], $vocabularies[$vid]->machine_name)) {