diff options
| author | icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-05-27 11:24:50 +0000 |
|---|---|---|
| committer | icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-05-27 11:24:50 +0000 |
| commit | ced270bbbdf14be4630940645129a121738e8156 (patch) | |
| tree | a67e35f7314504545c034f1bf9523f9ac0379f23 /engine/lib | |
| parent | eaf2ab7fcf4a915443d3890d98e1d4049e65be64 (diff) | |
| download | elgg-ced270bbbdf14be4630940645129a121738e8156.tar.gz elgg-ced270bbbdf14be4630940645129a121738e8156.tar.bz2 | |
Marcus Povey <marcus@dushka.co.uk>
* Fixed incorrect event trigger code - problem caused by incorrect is_array clause on event trigger functions
git-svn-id: https://code.elgg.org/elgg/trunk@724 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine/lib')
| -rw-r--r-- | engine/lib/elgglib.php | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php index 7902a04ae..ada252dba 100644 --- a/engine/lib/elgglib.php +++ b/engine/lib/elgglib.php @@ -663,8 +663,7 @@ return false;
}
- } else {
-
+ } else {
if (!empty($CONFIG->events[$event][$object_type]) && is_array($CONFIG->events[$event][$object_type])) {
foreach($CONFIG->events[$event][$object_type] as $eventfunction) {
if ($eventfunction($event, $object_type, $object) === false) {
@@ -672,21 +671,21 @@ }
}
}
- if (!empty($CONFIG->events['all'][$object_type]) && is_array($CONFIG->events[$event][$object_type])) {
+ if (!empty($CONFIG->events['all'][$object_type]) && is_array($CONFIG->events['all'][$object_type])) {
foreach($CONFIG->events['all'][$object_type] as $eventfunction) {
if ($eventfunction($event, $object_type, $object) === false) {
return false;
}
}
}
- if (!empty($CONFIG->events[$event]['all']) && is_array($CONFIG->events[$event][$object_type])) {
+ if (!empty($CONFIG->events[$event]['all']) && is_array($CONFIG->events[$event]['all'])) {
foreach($CONFIG->events[$event]['all'] as $eventfunction) {
if ($eventfunction($event, $object_type, $object) === false) {
return false;
}
}
}
- if (!empty($CONFIG->events['all']['all']) && is_array($CONFIG->events[$event][$object_type])) {
+ if (!empty($CONFIG->events['all']['all']) && is_array($CONFIG->events['all']['all'])) {
foreach($CONFIG->events['all']['all'] as $eventfunction) {
if ($eventfunction($event, $object_type, $object) === false) {
return false;
|