From 50bf99212cba53eaba35eaf8ced1aa88bbdd45a9 Mon Sep 17 00:00:00 2001
From: ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Wed, 9 Apr 2008 10:09:45 +0000
Subject: 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
---
 engine/lib/entities.php |  2 +-
 engine/start.php        | 17 +++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/engine/lib/entities.php b/engine/lib/entities.php
index a31da1c88..788a559d8 100644
--- a/engine/lib/entities.php
+++ b/engine/lib/entities.php
@@ -587,7 +587,7 @@
 		
 		if ($entity->canEdit()) {
 			if (trigger_event('update',$entity->type,$entity)) {
-				return update_data("UPDATE {$CONFIG->dbprefix}entities set owner_guid='$owner_guid', access_id='$access_id', time_updated='$time' WHERE guid=$guid and (access_id in {$access} or (access_id = 0 and owner_guid = {$_SESSION['id']}))");
+				return update_data("UPDATE {$CONFIG->dbprefix}entities set owner_guid='$owner_guid', access_id='$access_id', time_updated='$time' WHERE guid=$guid");
 			}
 		}
 	}
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(
-- 
cgit v1.2.3