From 9795d6a9451c98ae9ea624d4513c3d9c28a78d1a Mon Sep 17 00:00:00 2001 From: cash Date: Sat, 30 Oct 2010 21:53:58 +0000 Subject: ripped out last remaining tentacles of old installer from core - just needs removal of install.php when elgg_view() is updated git-svn-id: http://code.elgg.org/elgg/trunk@7141 36083f99-b078-4883-b0ff-0f9b5a30f544 --- engine/lib/sites.php | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) (limited to 'engine/lib/sites.php') diff --git a/engine/lib/sites.php b/engine/lib/sites.php index d5984a75f..960e54ee3 100644 --- a/engine/lib/sites.php +++ b/engine/lib/sites.php @@ -409,27 +409,23 @@ function get_site_domain($guid) { * * @return true */ -function sites_init($event, $object_type, $object) { +function sites_boot($event, $object_type, $object) { global $CONFIG; - 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; + $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; } // Register event handlers -register_elgg_event_handler('boot', 'system', 'sites_init', 2); +register_elgg_event_handler('boot', 'system', 'sites_boot', 2); // Register with unit test register_plugin_hook('unit_test', 'system', 'sites_test'); -- cgit v1.2.3