summaryrefslogtreecommitdiff
path: root/modules/trigger/trigger.admin.inc
diff options
context:
space:
mode:
authorwebchick <webchick@24967.no-reply.drupal.org>2012-03-26 22:40:00 -0700
committerwebchick <webchick@24967.no-reply.drupal.org>2012-03-26 22:40:00 -0700
commit37f518612102a1f91ea6179f4e53ce5db85b7c69 (patch)
treeee973cd9050087661ecb2b6967a682440a00b61e /modules/trigger/trigger.admin.inc
parentc6882c0f14a2abda4e0964c46c74a6eb81b22d3e (diff)
downloadbrdo-37f518612102a1f91ea6179f4e53ce5db85b7c69.tar.gz
brdo-37f518612102a1f91ea6179f4e53ce5db85b7c69.tar.bz2
Issue #960056 by catch, mikeytown2, pmitchell, cedarm: Fixed trigger_get_assigned_actions() has no static cache.
Diffstat (limited to 'modules/trigger/trigger.admin.inc')
-rw-r--r--modules/trigger/trigger.admin.inc2
1 files changed, 2 insertions, 0 deletions
diff --git a/modules/trigger/trigger.admin.inc b/modules/trigger/trigger.admin.inc
index c91fd12c4..447d0dc07 100644
--- a/modules/trigger/trigger.admin.inc
+++ b/modules/trigger/trigger.admin.inc
@@ -93,6 +93,7 @@ function trigger_unassign_submit($form, &$form_state) {
->condition('hook', $form_state['values']['hook'])
->condition('aid', $aid)
->execute();
+ drupal_static_reset('trigger_get_assigned_actions');
$actions = actions_get_all_actions();
watchdog('actions', 'Action %action has been unassigned.', array('%action' => $actions[$aid]['label']));
drupal_set_message(t('Action %action has been unassigned.', array('%action' => $actions[$aid]['label'])));
@@ -280,6 +281,7 @@ function trigger_assign_form_submit($form, &$form_state) {
}
}
}
+ drupal_static_reset('trigger_get_assigned_actions');
}
/**