Fixed some bugs including a load order patch from Rolando, and an update issue

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

1 files changed, 9 insertions, 8 deletions

diff --git a/engine/start.php b/engine/start.php
index a3386f309..87b8cfb1b 100644
--- a/engine/start.php
+++ b/engine/start.php
@@ -25,18 +25,11 @@
 			throw new InstallationException("Elgg could not load its main library.");

 		}

 		

-		if (!@include_once(dirname(__FILE__) . "/lib/actions.php")) {

-			throw new InstallationException("Elgg could not load the Actions library");

-		}	

-

-		if (!@include_once(dirname(__FILE__) . "/lib/sessions.php")) {

-			throw new InstallationException("Elgg could not load the Sessions library");

-		}	

-

 		if (!@include_once(dirname(__FILE__) . "/lib/export.php")) {		// Export library

 			echo "Error in installation: could not load the Export library.";

 			exit;

 		}

+

 		

 	/**

 	 * Establish handlers

@@ -72,6 +65,14 @@
 		 * except for a few exceptions

 		 */

 			

+			if (!@include_once(dirname(__FILE__) . "/lib/actions.php")) {

+				throw new InstallationException("Elgg could not load the Actions library");

+			}	

+

+			if (!@include_once(dirname(__FILE__) . "/lib/sessions.php")) {

+				throw new InstallationException("Elgg could not load the Sessions library");

+			}	

+

 		// We don't want to load or reload these files

 	

 			$file_exceptions = array(