summaryrefslogtreecommitdiff
path: root/modules/taxonomy/taxonomy.module
diff options
context:
space:
mode:
authorwebchick <webchick@24967.no-reply.drupal.org>2012-01-11 23:25:05 -0500
committerwebchick <webchick@24967.no-reply.drupal.org>2012-01-11 23:25:05 -0500
commit6f58aa16f0066d59c9e16a855ab1886d72f8d472 (patch)
tree2dcaaa07078853902992aa8a8c4e066f44dfd540 /modules/taxonomy/taxonomy.module
parent60dcf9501d74d916e8e06c2e8682322186bbad05 (diff)
downloadbrdo-6f58aa16f0066d59c9e16a855ab1886d72f8d472.tar.gz
brdo-6f58aa16f0066d59c9e16a855ab1886d72f8d472.tar.bz2
Issue #1391384 by yched, oriol_e9g: Fixed Wrong static clear on taxonomy_vocabulary_save().
Diffstat (limited to 'modules/taxonomy/taxonomy.module')
-rw-r--r--modules/taxonomy/taxonomy.module3
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module
index fb443ed49..7c11bccaf 100644
--- a/modules/taxonomy/taxonomy.module
+++ b/modules/taxonomy/taxonomy.module
@@ -428,6 +428,7 @@ function taxonomy_vocabulary_save($vocabulary) {
if (!empty($vocabulary->vid) && !empty($vocabulary->name)) {
$status = drupal_write_record('taxonomy_vocabulary', $vocabulary, 'vid');
+ taxonomy_vocabulary_static_reset(array($vocabulary->vid));
if ($vocabulary->old_machine_name != $vocabulary->machine_name) {
field_attach_rename_bundle('taxonomy_term', $vocabulary->old_machine_name, $vocabulary->machine_name);
}
@@ -436,6 +437,7 @@ function taxonomy_vocabulary_save($vocabulary) {
}
elseif (empty($vocabulary->vid)) {
$status = drupal_write_record('taxonomy_vocabulary', $vocabulary);
+ taxonomy_vocabulary_static_reset();
field_attach_create_bundle('taxonomy_term', $vocabulary->machine_name);
module_invoke_all('taxonomy_vocabulary_insert', $vocabulary);
module_invoke_all('entity_insert', $vocabulary, 'taxonomy_vocabulary');
@@ -443,7 +445,6 @@ function taxonomy_vocabulary_save($vocabulary) {
unset($vocabulary->original);
cache_clear_all();
- taxonomy_vocabulary_static_reset(array($vocabulary->vid));
return $status;
}