From 0ea4fa298c20a1cb25223b2bcaa5152c7a0f52dd Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Fri, 10 Aug 2012 13:53:40 +0200
Subject: [PATCH] Backgroundjobs: don't try to access OC_Appconfig if ownCloud
has not been installed
---
lib/base.php | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/lib/base.php b/lib/base.php
index dae62a029c8..3a65b30ae9f 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -109,7 +109,8 @@ class OC{
OC::$SUBURI=OC::$SUBURI.'index.php';
}
}
- OC::$WEBROOT=substr($scriptName,0,strlen($scriptName)-strlen(OC::$SUBURI));
+
+ OC::$WEBROOT=substr($scriptName,0,strlen($scriptName)-strlen(OC::$SUBURI));
if(OC::$WEBROOT!='' and OC::$WEBROOT[0]!=='/'){
OC::$WEBROOT='/'.OC::$WEBROOT;
@@ -241,15 +242,16 @@ class OC{
OC_Util::addScript( "jquery.infieldlabel.min" );
OC_Util::addScript( "jquery-tipsy" );
OC_Util::addScript( "oc-dialogs" );
- OC_Util::addScript( "backgroundjobs" );
OC_Util::addScript( "js" );
OC_Util::addScript( "eventsource" );
OC_Util::addScript( "config" );
//OC_Util::addScript( "multiselect" );
OC_Util::addScript('search','result');
- if( OC_Appconfig::getValue( 'core', 'backgroundjobs_mode', 'ajax' ) == 'ajax' ){
- OC_Util::addScript( 'backgroundjobs' );
+ if( OC_Config::getValue( 'installed', false )){
+ if( OC_Appconfig::getValue( 'core', 'backgroundjobs_mode', 'ajax' ) == 'ajax' ){
+ OC_Util::addScript( 'backgroundjobs' );
+ }
}
OC_Util::addStyle( "styles" );
--
GitLab