diff options
| author | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2017-01-10 17:44:39 +0100 |
|---|---|---|
| committer | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2017-01-10 17:50:29 +0100 |
| commit | e4b3ba65900f4ca4d879d7aa9702ea6a8b0bfee3 (patch) | |
| tree | a0b71bc4067d9f7a3de2438e8fe2cda173471651 /lib/private/TemplateLayout.php | |
| parent | 96d355984dac01b8bd9898ea6566ab341af811aa (diff) | |
| download | nextcloud-server-e4b3ba65900f4ca4d879d7aa9702ea6a8b0bfee3.tar.gz nextcloud-server-e4b3ba65900f4ca4d879d7aa9702ea6a8b0bfee3.zip | |
Create unified css file and merge all needed data into this file
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'lib/private/TemplateLayout.php')
| -rw-r--r-- | lib/private/TemplateLayout.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php index c3197b00282..5a35f6806c3 100644 --- a/lib/private/TemplateLayout.php +++ b/lib/private/TemplateLayout.php @@ -160,10 +160,11 @@ class TemplateLayout extends \OC_Template { $this->append( 'jsfiles', $web.'/'.$file . '?v=' . self::$versionHash); } - // Add the css files and check if server is already installed to prevent - // appdata initialisation before database configuration - // Prevent scss initialisation if an update is needed - if(\OC::$server->getSystemConfig()->getValue('installed', false) && !\OCP\Util::needUpgrade()) { + // Do not initialise scss appdata until we have a fully installed instance + // Do not load scss for update, errors, installation or login page + if(\OC::$server->getSystemConfig()->getValue('installed', false) + && !\OCP\Util::needUpgrade() + && \OC_User::isLoggedIn()) { $cssFiles = self::findStylesheetFiles(\OC_Util::$styles); } else { $cssFiles = self::findStylesheetFiles(\OC_Util::$styles, false); |