diff options
| author | ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-04-09 10:09:45 +0000 |
|---|---|---|
| committer | ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-04-09 10:09:45 +0000 |
| commit | 50bf99212cba53eaba35eaf8ced1aa88bbdd45a9 (patch) | |
| tree | 9c264ed6b9c89fadce9cd4da3d7dcdb7728789ea | |
| parent | 9fc83c75d502d8564310aa72569648af37aaf499 (diff) | |
| download | elgg-50bf99212cba53eaba35eaf8ced1aa88bbdd45a9.tar.gz elgg-50bf99212cba53eaba35eaf8ced1aa88bbdd45a9.tar.bz2 | |
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
| -rw-r--r-- | engine/lib/entities.php | 2 | ||||
| -rw-r--r-- | 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(
|