Merge pull request #12544 from nupplaphil/bug/redirect

[friendica.git] / view / theme / vier / style.php

diff --git a/view/theme/vier/style.php b/view/theme/vier/style.php
index 8e31a14bfcabecfd553169fa1b82a8d365c54803..74975893ce8ac6d17a288a2562d94ee58f6cfdad 100644 (file)
--- a/view/theme/vier/style.php
+++ b/view/theme/vier/style.php
@@ -23,16 +23,16 @@ use Friendica\Core\Logger;
 use Friendica\DI;
 use Friendica\Network\HTTPException\NotModifiedException;
 
-$uid = $_REQUEST['puid'] ?? 0;
-
-$style = DI::pConfig()->get($uid, 'vier', 'style');
+/*
+ * This script can be included when the maintenance mode is on, which requires us to avoid any config call and
+ * use the following hardcoded default
+ */
+$style = 'plus';
 
-if (empty($style)) {
-       $style = DI::config()->get('vier', 'style');
-}
+if (DI::mode()->has(\Friendica\App\Mode::MAINTENANCEDISABLED)) {
+       $uid = $_REQUEST['puid'] ?? 0;
 
-if (empty($style)) {
-       $style = "plus";
+       $style = DI::pConfig()->get($uid, 'vier', 'style', DI::config()->get('vier', 'style', $style));
 }
 
 $stylecss = '';
@@ -49,8 +49,7 @@ foreach (['style', $style] as $file) {
                        $modified = $stylemodified;
                }
        } else {
-               //TODO: use Logger::ERROR?
-               Logger::notice('Error: missing file: "' . $stylecssfile .'" (userid: '. $uid .')');
+               Logger::warning('Missing CSS file', ['file' => $stylecssfile, 'uid' => $uid]);
        }
 }
 $modified = gmdate('r', $modified);