Fixes #3684 prevent pagesetup, system event from firing during the init, system event

2 files changed, 4 insertions, 1 deletions

diff --git a/engine/lib/views.php b/engine/lib/views.php
index 1b013be6f..c98ad4e78 100644
--- a/engine/lib/views.php
+++ b/engine/lib/views.php
@@ -403,7 +403,7 @@ function elgg_view($view, $vars = array(), $bypass = false, $debug = false, $vie
 	$view_orig = $view;
 
 	// Trigger the pagesetup event
-	if (!isset($CONFIG->pagesetupdone)) {
+	if (!isset($CONFIG->pagesetupdone) && $CONFIG->boot_complete) {
 		$CONFIG->pagesetupdone = true;
 		elgg_trigger_event('pagesetup', 'system');
 	}
diff --git a/engine/start.php b/engine/start.php
index 506e27380..5f4bded45 100644
--- a/engine/start.php
+++ b/engine/start.php
@@ -49,6 +49,7 @@ global $CONFIG;
 if (!isset($CONFIG)) {
 	$CONFIG = new stdClass;
 }
+$CONFIG->boot_complete = false;
 
 $lib_dir = dirname(__FILE__) . '/lib/';
 
@@ -105,5 +106,7 @@ elgg_trigger_event('plugins_boot', 'system');
 // Complete the boot process for both engine and plugins
 elgg_trigger_event('init', 'system');
 
+$CONFIG->boot_complete = true;
+
 // System loaded and ready
 elgg_trigger_event('ready', 'system');