mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Backgroundjobs: don't try to access OC_Appconfig if ownCloud has not been installed

This commit is contained in:
Jakob Sack 2012-08-10 13:53:40 +02:00
parent 81b997b56e
commit 0ea4fa298c
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/base.php
View File

@ -109,7 +109,8 @@ class OC{
OC::$SUBURI=OC::$SUBURI.'index.php'; 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]!=='/'){ if(OC::$WEBROOT!='' and OC::$WEBROOT[0]!=='/'){
OC::$WEBROOT='/'.OC::$WEBROOT; OC::$WEBROOT='/'.OC::$WEBROOT;
@ -241,15 +242,16 @@ class OC{
OC_Util::addScript( "jquery.infieldlabel.min" ); OC_Util::addScript( "jquery.infieldlabel.min" );
OC_Util::addScript( "jquery-tipsy" ); OC_Util::addScript( "jquery-tipsy" );
OC_Util::addScript( "oc-dialogs" ); OC_Util::addScript( "oc-dialogs" );
OC_Util::addScript( "backgroundjobs" );
OC_Util::addScript( "js" ); OC_Util::addScript( "js" );
OC_Util::addScript( "eventsource" ); OC_Util::addScript( "eventsource" );
OC_Util::addScript( "config" ); OC_Util::addScript( "config" );
//OC_Util::addScript( "multiselect" ); //OC_Util::addScript( "multiselect" );
OC_Util::addScript('search','result'); OC_Util::addScript('search','result');
if( OC_Appconfig::getValue( 'core', 'backgroundjobs_mode', 'ajax' ) == 'ajax' ){ if( OC_Config::getValue( 'installed', false )){
OC_Util::addScript( 'backgroundjobs' ); if( OC_Appconfig::getValue( 'core', 'backgroundjobs_mode', 'ajax' ) == 'ajax' ){
OC_Util::addScript( 'backgroundjobs' );
}
} }
OC_Util::addStyle( "styles" ); OC_Util::addStyle( "styles" );