Incorporating setup fixes from Rolando

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

1 files changed, 20 insertions, 12 deletions

diff --git a/engine/start.php b/engine/start.php
index 956f0ac3e..a3386f309 100644
--- a/engine/start.php
+++ b/engine/start.php
@@ -14,20 +14,28 @@
 

 	/**

 	 * Load important prerequisites

-	 */
-
-		if (!@include_once(dirname(__FILE__) . "/lib/exceptions.php")) {		// Exceptions 
-			echo "Error in installation: could not load the Exceptions library.";
-			exit;
+	 */

+

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

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

+			exit;

 		}

 

 		if (!@include_once(dirname(__FILE__) . "/lib/elgglib.php")) {		// Main Elgg library

 			throw new InstallationException("Elgg could not load its main library.");

-		}
-		
-		if (!@include_once(dirname(__FILE__) . "/lib/export.php")) {		// Export library
-			echo "Error in installation: could not load the Export library.";
-			exit;
+		}

+		

+		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;

 		}

 		

 	/**

@@ -68,9 +76,9 @@
 	

 			$file_exceptions = array(

 										'.','..',

-										'.svn',
+										'.svn',

 										'CVS','cvs',

-										'settings.php','settings.example.php','elgglib.php','database.php'

+										'settings.php','settings.example.php','exceptions.php','elgglib.php','database.php','actions.php','sessions.php'

 									);

 	

 		// Get the list of files to include, and alphabetically sort them