From 0dab7f2e53c883b8d61124a87888e33307f0c39f Mon Sep 17 00:00:00 2001
From: Jakob Sack <kde@jakobsack.de>
Date: Sun, 31 Jul 2011 00:06:17 +0200
Subject: laod apps ways earlier!

---
 lib/base.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'lib/base.php')

diff --git a/lib/base.php b/lib/base.php
index 5b88bd899e9..4fa38286bef 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -88,6 +88,12 @@ if( !OC_Config::getValue( "installed", false )){
 	$_SESSION['user_id'] = '';
 }
 
+// Load Apps
+// This includes plugins for users and filesystems as well
+if(!$error and !$RUNTIME_NOAPPS ){
+	OC_App::loadApps();
+}
+
 OC_User::useBackend( OC_Config::getValue( "userbackend", "database" ));
 OC_Group::setBackend( OC_Config::getValue( "groupbackend", "database" ));
 
@@ -106,10 +112,6 @@ OC_Util::addScript( "js" );
 OC_Util::addStyle( "jquery-ui-1.8.14.custom" );
 OC_Util::addStyle( "styles" );
 
-// Load Apps
-if(!$error and !$RUNTIME_NOAPPS ){
-	OC_App::loadApps();
-}
 
 // FROM Connect.php
 function OC_CONNECT_TEST($path,$user,$password){
-- 
cgit v1.2.3


From 0503c3499ee03bcb220416ac1162cafcf5b38bc4 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Sun, 31 Jul 2011 00:23:06 +0200
Subject: configure users/groups before loading apps

---
 lib/base.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'lib/base.php')

diff --git a/lib/base.php b/lib/base.php
index 4fa38286bef..8c550d74fb8 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -88,15 +88,16 @@ if( !OC_Config::getValue( "installed", false )){
 	$_SESSION['user_id'] = '';
 }
 
+
+OC_User::useBackend( OC_Config::getValue( "userbackend", "database" ));
+OC_Group::setBackend( OC_Config::getValue( "groupbackend", "database" ));
+
 // Load Apps
 // This includes plugins for users and filesystems as well
 if(!$error and !$RUNTIME_NOAPPS ){
 	OC_App::loadApps();
 }
 
-OC_User::useBackend( OC_Config::getValue( "userbackend", "database" ));
-OC_Group::setBackend( OC_Config::getValue( "groupbackend", "database" ));
-
 // Was in required file ... put it here
 OC_Filesystem::registerStorageType('local','OC_Filestorage_Local',array('datadir'=>'string'));
 
-- 
cgit v1.2.3