From 2d0bd94c643add43312294bab13789b16461878a Mon Sep 17 00:00:00 2001
From: ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Tue, 23 Sep 2008 16:37:53 +0000
Subject: The cache library is now loaded before the main library boot.

git-svn-id: https://code.elgg.org/elgg/trunk@2106 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 engine/lib/api.php | 6 ++----
 engine/start.php   | 5 +++++
 2 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'engine')

diff --git a/engine/lib/api.php b/engine/lib/api.php
index b60f90572..a44a4fc72 100644
--- a/engine/lib/api.php
+++ b/engine/lib/api.php
@@ -11,8 +11,6 @@
 	 * @link http://elgg.org/
 	 */
 
-	require_once('cache.php');
-
 	// Result classes /////////////////////////////////////////////////////////////////////////
 
 	/**
@@ -241,7 +239,7 @@
 		/**
 		 * Clean out old stuff.
 		 *
-		 */
+		 */
 		public function __destruct()
 		{
 			global $CONFIG;
@@ -252,7 +250,7 @@
 			$expires = $time-$age;
 			
 			delete_data("DELETE from {$CONFIG->dbprefix}hmac_cache where ts<$expires");
-		}
+		}
 	}
 
 	// API Call functions /////////////////////////////////////////////////////////////////////	
diff --git a/engine/start.php b/engine/start.php
index dc785974b..9df474842 100644
--- a/engine/start.php
+++ b/engine/start.php
@@ -51,6 +51,11 @@
 		if (!@include_once(dirname(__FILE__) . "/lib/install.php")) {		// Installation library
 			echo "Error in installation: could not load the installation library.";
 			exit;
+		}
+		
+		if (!@include_once(dirname(__FILE__) . "/lib/cache.php")) {		// Installation library
+			echo "Error in installation: could not load the cache library.";
+			exit;
 		}
 		
 		// Use fallback view until sanitised
-- 
cgit v1.2.3