From 000335ccb23511fa28fb5000d13bcf6c9e6215a4 Mon Sep 17 00:00:00 2001
From: marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Mon, 5 Jan 2009 11:26:52 +0000
Subject: 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
---
 engine/lib/sites.php | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

(limited to 'engine/lib/sites.php')

diff --git a/engine/lib/sites.php b/engine/lib/sites.php
index 4c8a57ec4..f012b3cb4 100644
--- a/engine/lib/sites.php
+++ b/engine/lib/sites.php
@@ -595,19 +595,21 @@
 			
 			global $CONFIG;
 			
-			if (!is_installed() || !is_db_installed()) return false;
-			
-			$site = trigger_plugin_hook("siteid","system");
-			if ($site === null || $site === false) {
-				$CONFIG->site_id = (int) datalist_get('default_site');
-			} else {
-				$CONFIG->site_id = $site;
-			}
-			$CONFIG->site_guid = $CONFIG->site_id;
-			$CONFIG->site = get_entity($CONFIG->site_guid);
-			
+			if (is_installed() && is_db_installed()) {
+				
+				$site = trigger_plugin_hook("siteid","system");
+				if ($site === null || $site === false) {
+					$CONFIG->site_id = (int) datalist_get('default_site');
+				} else {
+					$CONFIG->site_id = $site;
+				}
+				$CONFIG->site_guid = $CONFIG->site_id;
+				$CONFIG->site = get_entity($CONFIG->site_guid);
+				
+				return true;
+			}
+			
 			return true;
-			
 		}
 		
 	// Register event handlers
-- 
cgit v1.2.3