From fbd06d6d4c02599e4040379172bb56dd29e4c21f Mon Sep 17 00:00:00 2001
From: Daniel Wehner <daniel.wehner@erdfisch.de>
Date: Tue, 22 May 2012 18:11:35 +0200
Subject: [PATCH] taxonomy_get_vocabularies() was renamed to
taxonomy_vocabulary_get_names().
---
modules/taxonomy/views_handler_field_term_node_tid.inc | 4 ++--
modules/taxonomy/views_handler_filter_term_node_tid.inc | 4 ++--
.../taxonomy/views_handler_filter_vocabulary_machine_name.inc | 2 +-
modules/taxonomy/views_handler_filter_vocabulary_vid.inc | 2 +-
.../taxonomy/views_handler_relationship_node_term_data.inc | 4 ++--
.../taxonomy/views_plugin_argument_default_taxonomy_tid.inc | 4 ++--
.../taxonomy/views_plugin_argument_validate_taxonomy_term.inc | 4 ++--
7 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/modules/taxonomy/views_handler_field_term_node_tid.inc b/modules/taxonomy/views_handler_field_term_node_tid.inc
index 4c6362e5d030..6b9c93ac9120 100644
--- a/modules/taxonomy/views_handler_field_term_node_tid.inc
+++ b/modules/taxonomy/views_handler_field_term_node_tid.inc
@@ -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);
}
diff --git a/modules/taxonomy/views_handler_filter_term_node_tid.inc b/modules/taxonomy/views_handler_filter_term_node_tid.inc
index 7eb868f79ed0..e0dd0f9dd315 100644
--- a/modules/taxonomy/views_handler_filter_term_node_tid.inc
+++ b/modules/taxonomy/views_handler_filter_term_node_tid.inc
@@ -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);
diff --git a/modules/taxonomy/views_handler_filter_vocabulary_machine_name.inc b/modules/taxonomy/views_handler_filter_vocabulary_machine_name.inc
index 062450c70202..18754b2270f0 100644
--- a/modules/taxonomy/views_handler_filter_vocabulary_machine_name.inc
+++ b/modules/taxonomy/views_handler_filter_vocabulary_machine_name.inc
@@ -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;
}
diff --git a/modules/taxonomy/views_handler_filter_vocabulary_vid.inc b/modules/taxonomy/views_handler_filter_vocabulary_vid.inc
index 2759ee1ec5fc..f2c4ccd3ab94 100644
--- a/modules/taxonomy/views_handler_filter_vocabulary_vid.inc
+++ b/modules/taxonomy/views_handler_filter_vocabulary_vid.inc
@@ -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;
}
diff --git a/modules/taxonomy/views_handler_relationship_node_term_data.inc b/modules/taxonomy/views_handler_relationship_node_term_data.inc
index b684d1dd4446..bd3981e4d0d2 100644
--- a/modules/taxonomy/views_handler_relationship_node_term_data.inc
+++ b/modules/taxonomy/views_handler_relationship_node_term_data.inc
@@ -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);
diff --git a/modules/taxonomy/views_plugin_argument_default_taxonomy_tid.inc b/modules/taxonomy/views_plugin_argument_default_taxonomy_tid.inc
index 9c1d81f9cf4a..65d427bbc9a7 100644
--- a/modules/taxonomy/views_plugin_argument_default_taxonomy_tid.inc
+++ b/modules/taxonomy/views_plugin_argument_default_taxonomy_tid.inc
@@ -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);
}
diff --git a/modules/taxonomy/views_plugin_argument_validate_taxonomy_term.inc b/modules/taxonomy/views_plugin_argument_validate_taxonomy_term.inc
index 3a8819984df1..a324a011704b 100644
--- a/modules/taxonomy/views_plugin_argument_validate_taxonomy_term.inc
+++ b/modules/taxonomy/views_plugin_argument_validate_taxonomy_term.inc
@@ -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);
--
GitLab