diff options
| author | Dries Buytaert <dries@buytaert.net> | 2008-12-18 23:07:50 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2008-12-18 23:07:50 +0000 |
| commit | eb9aefe8b599feb896339b13ba19e5faf3906b23 (patch) | |
| tree | e8e51c321a2b69cacfdc05e2f9c3dbe3225c0015 /modules/trigger | |
| parent | 8a48acb0b26879d45cfacc8f5dda9936eb44e02d (diff) | |
| download | brdo-eb9aefe8b599feb896339b13ba19e5faf3906b23.tar.gz brdo-eb9aefe8b599feb896339b13ba19e5faf3906b23.tar.bz2 | |
- Patch #344361 by Rob Loach, recidive: remove some cruft left from the de-op nodeapi patch.
Diffstat (limited to 'modules/trigger')
| -rw-r--r-- | modules/trigger/trigger.module | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/modules/trigger/trigger.module b/modules/trigger/trigger.module index 86afb1c19..0eb4b50fe 100644 --- a/modules/trigger/trigger.module +++ b/modules/trigger/trigger.module @@ -209,8 +209,7 @@ function _trigger_nodeapi($node, $op, $a3 = NULL, $a4 = NULL) { static $objects; // Prevent recursion by tracking which operations have already been called. static $recursion; - // Support a subset of operations. - if (!in_array($op, array('view', 'update', 'presave', 'insert', 'delete')) || isset($recursion[$op])) { + if (isset($recursion[$op])) { return; } $recursion[$op] = TRUE; @@ -433,10 +432,6 @@ function trigger_user_view(&$edit, &$account, $category) { function _trigger_user($op, &$edit, &$account, $category = NULL) { // Keep objects for reuse so that changes actions make to objects can persist. static $objects; - // We support a subset of operations. - if (!in_array($op, array('login', 'logout', 'insert', 'update', 'delete', 'view'))) { - return; - } $aids = _trigger_get_hook_aids('user', $op); $context = array( 'hook' => 'user', |