Issue #2507061 by DrCord, Begun: Undefined index vid in...

Issue #2507061 by DrCord, Begun: Undefined index vid in better_exposed_filters_exposed_form_plugin.inc

better_exposed_filters_exposed_form_plugin.inc

@@ -1120,9 +1120,8 @@ dateFormat: "dd-mm-yy"
         // Collect replacement data.
         $data = array();
         $available = $options['more_options']['tokens']['available'];
-        if (in_array('vocabulary', $available)) {
-          $vocabs = taxonomy_get_vocabularies();
-          $data['vocabulary'] = $vocabs[$filters[$label]->options['vid']];
+        if (in_array('vocabulary', $available) && isset($filters[$label]->definition['vocabulary'])) {
+          $data['vocabulary'] = taxonomy_vocabulary_machine_name_load($filters[$label]->definition['vocabulary']);
         }
         /* Others? */