diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-02-06 18:15:56 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-06 18:15:56 -0600 |
| commit | 5157f16d286f1ea43cc8f25bd49948ba6972a6c9 (patch) | |
| tree | 04f7706b027c1de667456d09553774a18b1eda5c /lib | |
| parent | b55f5af7eaab6f827989407fa7b8d51cbb877eab (diff) | |
| parent | 5383cc617036e58db525f19c24764c78a16babbd (diff) | |
| download | nextcloud-server-5157f16d286f1ea43cc8f25bd49948ba6972a6c9.tar.gz nextcloud-server-5157f16d286f1ea43cc8f25bd49948ba6972a6c9.zip | |
Merge pull request #3352 from nextcloud/public-page-guest-css-loader
Fix public page css fallback loading
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/base.php | 4 | ||||
| -rw-r--r-- | lib/private/TemplateLayout.php | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/base.php b/lib/base.php index 3ba0755eaab..9f480c0b0dc 100644 --- a/lib/base.php +++ b/lib/base.php @@ -281,7 +281,6 @@ class OC { // render error page $template = new OC_Template('', 'update.user', 'guest'); OC_Util::addScript('maintenance-check'); - OC_Util::addStyle('guest'); $template->printPage(); die(); } @@ -355,8 +354,6 @@ class OC { header('Status: 503 Service Temporarily Unavailable'); header('Retry-After: 120'); - OC_Util::addStyle('guest'); - // render error page $template = new OC_Template('', 'update.use-cli', 'guest'); $template->assign('productName', 'nextcloud'); // for now @@ -378,7 +375,6 @@ class OC { $systemConfig->setValue('theme', ''); OC_Util::addScript('config'); // needed for web root OC_Util::addScript('update'); - OC_Util::addStyle('guest'); /** @var \OC\App\AppManager $appManager */ $appManager = \OC::$server->getAppManager(); diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php index 7ded109f76b..19fc9462185 100644 --- a/lib/private/TemplateLayout.php +++ b/lib/private/TemplateLayout.php @@ -164,11 +164,15 @@ class TemplateLayout extends \OC_Template { // Do not load scss for update, errors, installation or login page if(\OC::$server->getSystemConfig()->getValue('installed', false) && !\OCP\Util::needUpgrade() - && strpos(\OC::$server->getRequest()->getRequestUri(), \OC::$server->getURLGenerator()->linkToRoute('core.login.tryLogin')) !== 0) { + && !preg_match('/^\/login/', \OC::$server->getRequest()->getPathInfo())) { $cssFiles = self::findStylesheetFiles(\OC_Util::$styles); } else { + // If we ignore the scss compiler, + // we need to load the guest css fallback + \OC_Util::addStyle('guest'); $cssFiles = self::findStylesheetFiles(\OC_Util::$styles, false); } + $this->assign('cssfiles', array()); $this->assign('printcssfiles', []); $this->assign('versionHash', self::$versionHash); |