From 5a6a5104b625e45da803b282e6508054337b0a99 Mon Sep 17 00:00:00 2001 From: marcus Date: Sat, 21 Jun 2008 08:25:09 +0000 Subject: Plugin init only called on sanitised installs where installation is complete. git-svn-id: https://code.elgg.org/elgg/trunk@1040 36083f99-b078-4883-b0ff-0f9b5a30f544 --- engine/start.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/engine/start.php b/engine/start.php index ed452d78f..3d59b1894 100644 --- a/engine/start.php +++ b/engine/start.php @@ -75,7 +75,7 @@ * to load any more files */ - if (sanitised()) { // Begin portion for sanitised installs only + if ($sanitised = sanitised()) { // Begin portion for sanitised installs only /** * Load the system settings @@ -143,19 +143,22 @@ // Load plugins + $installed = is_installed(); + $db_installed = is_db_installed(); + // Determine light mode $lm = strtolower(get_input('lightmode')); if ($lm == 'true') $lightmode = true; // Load plugins, if we're not in light mode - if (!$lightmode) { + if (($installed) && ($db_installed) && ($sanitised) && (!$lightmode)) { load_plugins(); trigger_elgg_event('plugins_boot', 'system'); } // Forward if we haven't been installed - if ((!is_installed() || !is_db_installed()) && !substr_count($_SERVER["PHP_SELF"],"install.php") && !substr_count($_SERVER["PHP_SELF"],"css.php") && !substr_count($_SERVER["PHP_SELF"],"action_handler.php")) { + if ((!$installed || !$db_installed) && !substr_count($_SERVER["PHP_SELF"],"install.php") && !substr_count($_SERVER["PHP_SELF"],"css.php") && !substr_count($_SERVER["PHP_SELF"],"action_handler.php")) { header("Location: install.php"); exit; } -- cgit v1.2.3