Commit fbd06d6d authored by dawehner's avatar dawehner Committed by tim.plunkett
Browse files

taxonomy_get_vocabularies() was renamed to taxonomy_vocabulary_get_names().

parent d840dcfd
......@@ -23,7 +23,7 @@ function init(&$view, &$options) {
// Convert legacy vids option to machine name vocabularies.
if (!empty($this->options['vids'])) {
$vocabularies = taxonomy_get_vocabularies();
$vocabularies = taxonomy_vocabulary_get_names();
foreach ($this->options['vids'] as $vid) {
if (isset($vocabularies[$vid], $vocabularies[$vid]->machine_name)) {
$this->options['vocabularies'][$vocabularies[$vid]->machine_name] = $vocabularies[$vid]->machine_name;
......@@ -59,7 +59,7 @@ function options_form(&$form, &$form_state) {
);
$options = array();
$vocabularies = taxonomy_get_vocabularies();
$vocabularies = taxonomy_vocabulary_get_names();
foreach ($vocabularies as $voc) {
$options[$voc->machine_name] = check_plain($voc->name);
}
......
......@@ -22,7 +22,7 @@ function init(&$view, &$options) {
// Convert legacy vid option to machine name vocabulary.
if (isset($this->options['vid']) && !empty($this->options['vid']) & empty($this->options['vocabulary'])) {
$vocabularies = taxonomy_get_vocabularies();
$vocabularies = taxonomy_vocabulary_get_names();
$vid = $this->options['vid'];
if (isset($vocabularies[$vid], $vocabularies[$vid]->machine_name)) {
$this->options['vocabulary'] = $vocabularies[$vid]->machine_name;
......@@ -47,7 +47,7 @@ function option_definition() {
}
function extra_options_form(&$form, &$form_state) {
$vocabularies = taxonomy_get_vocabularies();
$vocabularies = taxonomy_vocabulary_get_names();
$options = array();
foreach ($vocabularies as $voc) {
$options[$voc->machine_name] = check_plain($voc->name);
......
......@@ -17,7 +17,7 @@ function get_value_options() {
}
$this->value_options = array();
$vocabularies = taxonomy_get_vocabularies();
$vocabularies = taxonomy_vocabulary_get_names();
foreach ($vocabularies as $voc) {
$this->value_options[$voc->machine_name] = $voc->name;
}
......
......@@ -17,7 +17,7 @@ function get_value_options() {
}
$this->value_options = array();
$vocabularies = taxonomy_get_vocabularies();
$vocabularies = taxonomy_vocabulary_get_names();
foreach ($vocabularies as $voc) {
$this->value_options[$voc->vid] = $voc->name;
}
......
......@@ -16,7 +16,7 @@ function init(&$view, &$options) {
// Convert legacy vids option to machine name vocabularies.
if (!empty($this->options['vids'])) {
$vocabularies = taxonomy_get_vocabularies();
$vocabularies = taxonomy_vocabulary_get_names();
foreach ($this->options['vids'] as $vid) {
if (isset($vocabularies[$vid], $vocabularies[$vid]->machine_name)) {
$this->options['vocabularies'][$vocabularies[$vid]->machine_name] = $vocabularies[$vid]->machine_name;
......@@ -32,7 +32,7 @@ function option_definition() {
}
function options_form(&$form, &$form_state) {
$vocabularies = taxonomy_get_vocabularies();
$vocabularies = taxonomy_vocabulary_get_names();
$options = array();
foreach ($vocabularies as $voc) {
$options[$voc->machine_name] = check_plain($voc->name);
......
......@@ -14,7 +14,7 @@ function init(&$view, &$argument, $options) {
// Convert legacy vids option to machine name vocabularies.
if (!empty($this->options['vids'])) {
$vocabularies = taxonomy_get_vocabularies();
$vocabularies = taxonomy_vocabulary_get_names();
foreach ($this->options['vids'] as $vid) {
if (isset($vocabularies[$vid], $vocabularies[$vid]->machine_name)) {
$this->options['vocabularies'][$vocabularies[$vid]->machine_name] = $vocabularies[$vid]->machine_name;
......@@ -58,7 +58,7 @@ function options_form(&$form, &$form_state) {
);
$options = array();
$vocabularies = taxonomy_get_vocabularies();
$vocabularies = taxonomy_vocabulary_get_names();
foreach ($vocabularies as $voc) {
$options[$voc->machine_name] = check_plain($voc->name);
}
......
......@@ -14,7 +14,7 @@ function init(&$view, &$argument, $options) {
// Convert legacy vids option to machine name vocabularies.
if (!empty($this->options['vids'])) {
$vocabularies = taxonomy_get_vocabularies();
$vocabularies = taxonomy_vocabulary_get_names();
foreach ($this->options['vids'] as $vid) {
if (isset($vocabularies[$vid], $vocabularies[$vid]->machine_name)) {
$this->options['vocabularies'][$vocabularies[$vid]->machine_name] = $vocabularies[$vid]->machine_name;
......@@ -33,7 +33,7 @@ function option_definition() {
}
function options_form(&$form, &$form_state) {
$vocabularies = taxonomy_get_vocabularies();
$vocabularies = taxonomy_vocabulary_get_names();
$options = array();
foreach ($vocabularies as $voc) {
$options[$voc->machine_name] = check_plain($voc->name);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment