wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Do not trigger the update exception when we already show an error

Browse source
This commit is contained in:
Joas Schilling 2015-10-07 08:07:52 +02:00
parent 285e73ac72
commit 937fb70757
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/private/template.php
View file

@ -69,7 +69,7 @@ class OC_Template extends \OC\Template\Base {
public function __construct( $app, $name, $renderAs = "", $registerCall = true ) { public function __construct( $app, $name, $renderAs = "", $registerCall = true ) {
// Read the selected theme from the config file // Read the selected theme from the config file
self::initTemplateEngine(); self::initTemplateEngine($renderAs);
$theme = OC_Util::getTheme(); $theme = OC_Util::getTheme();
@ -89,13 +89,13 @@ class OC_Template extends \OC\Template\Base {
parent::__construct($template, $requesttoken, $l10n, $themeDefaults); parent::__construct($template, $requesttoken, $l10n, $themeDefaults);
} }
public static function initTemplateEngine() { public static function initTemplateEngine($renderAs) {
if (self::$initTemplateEngineFirstRun){ if (self::$initTemplateEngineFirstRun){
//apps that started before the template initialization can load their own scripts/styles //apps that started before the template initialization can load their own scripts/styles
//so to make sure this scripts/styles here are loaded first we use OC_Util::addScript() with $prepend=true //so to make sure this scripts/styles here are loaded first we use OC_Util::addScript() with $prepend=true
//meaning the last script/style in this list will be loaded first //meaning the last script/style in this list will be loaded first
if (\OC::$server->getSystemConfig ()->getValue ( 'installed', false ) && ! \OCP\Util::needUpgrade ()) { if (\OC::$server->getSystemConfig()->getValue ('installed', false) && $renderAs !== 'error' && !\OCP\Util::needUpgrade()) {
if (\OC::$server->getConfig ()->getAppValue ( 'core', 'backgroundjobs_mode', 'ajax' ) == 'ajax') { if (\OC::$server->getConfig ()->getAppValue ( 'core', 'backgroundjobs_mode', 'ajax' ) == 'ajax') {
OC_Util::addScript ( 'backgroundjobs', null, true ); OC_Util::addScript ( 'backgroundjobs', null, true );
} }