summaryrefslogtreecommitdiff
path: root/modules/trigger/trigger.module
diff options
context:
space:
mode:
Diffstat (limited to 'modules/trigger/trigger.module')
-rw-r--r--modules/trigger/trigger.module10
1 files changed, 5 insertions, 5 deletions
diff --git a/modules/trigger/trigger.module b/modules/trigger/trigger.module
index 4d8190bba..2bdfec24d 100644
--- a/modules/trigger/trigger.module
+++ b/modules/trigger/trigger.module
@@ -609,13 +609,13 @@ function trigger_actions_delete($aid) {
* Retrieves and caches information from hook_trigger_info() implementations.
*/
function _trigger_get_all_info() {
- static $triggers = NULL;
- if( $triggers ) {
- return $triggers;
+ $triggers = &drupal_static(__FUNCTION__);
+
+ if (!isset($triggers)) {
+ $triggers = module_invoke_all('trigger_info');
+ drupal_alter('trigger_info', $triggers);
}
- $triggers = module_invoke_all('trigger_info');
- drupal_alter('trigger_info', $triggers);
return $triggers;
}