Fixes #655, Refs #628: Install now working with correct event chain (#628).

git-svn-id: https://code.elgg.org/elgg/trunk@2530 36083f99-b078-4883-b0ff-0f9b5a30f544

1 files changed, 12 insertions, 1 deletions

diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
index 9c4e58a81..d0a28b2ea 100644
--- a/engine/lib/elgglib.php
+++ b/engine/lib/elgglib.php
@@ -1348,33 +1348,44 @@
 				}
 			
 			} else {
-				
+			
 				$return = true;
 				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) {
 							return false;
+							//$return = false;
+							//break;
 						}
 					}
 				}
+				
 				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;
+							//$return = false;
+							//break;
 						}
 					}
 				}
+			
 				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;
+							//$return = false;
+							//break;
 						}
 					}
 				}
+			
 				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;
+							//$return = false;
+							//break;
 						}
 					}
 				}