From 2c8b4da840e64aff9f745ae7f75f300a027dad59 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Sun, 31 Jul 2011 02:24:46 +0200 Subject: [PATCH] make sure jquery and common javascript is loaded before the javascript of the apps --- lib/base.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/base.php b/lib/base.php index 8c550d74fb..2c29d9c571 100644 --- a/lib/base.php +++ b/lib/base.php @@ -92,6 +92,13 @@ if( !OC_Config::getValue( "installed", false )){ OC_User::useBackend( OC_Config::getValue( "userbackend", "database" )); OC_Group::setBackend( OC_Config::getValue( "groupbackend", "database" )); +// Add the stuff we need always +OC_Util::addScript( "jquery-1.6.2.min" ); +OC_Util::addScript( "jquery-ui-1.8.14.custom.min" ); +OC_Util::addScript( "js" ); +OC_Util::addStyle( "jquery-ui-1.8.14.custom" ); +OC_Util::addStyle( "styles" ); + // Load Apps // This includes plugins for users and filesystems as well if(!$error and !$RUNTIME_NOAPPS ){ @@ -106,13 +113,6 @@ if(!$error and !$RUNTIME_NOSETUPFS ){ OC_Util::setupFS(); } -// Add the stuff we need always -OC_Util::addScript( "jquery-1.6.2.min" ); -OC_Util::addScript( "jquery-ui-1.8.14.custom.min" ); -OC_Util::addScript( "js" ); -OC_Util::addStyle( "jquery-ui-1.8.14.custom" ); -OC_Util::addStyle( "styles" ); - // FROM Connect.php function OC_CONNECT_TEST($path,$user,$password){