Merge pull request #6616 from m4sk1n/patch-1

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

diff --git a/view/theme/frio/style.php b/view/theme/frio/style.php
index 393dca2f900d62aa61cd70c868b6e31ecd5c6862..d8bffa9c645c4ff048b0b329a2927f7e32d2d4e9 100644 (file)
--- a/view/theme/frio/style.php
+++ b/view/theme/frio/style.php
@@ -14,12 +14,12 @@ $scheme_modified = 0;
 
 if ($a->module !== 'install') {
        // Get the UID of the profile owner.
-       $uid = Profile::getThemeUid();
+       $uid = defaults($_REQUEST, 'puid', 0);
        if ($uid) {
                PConfig::load($uid, 'frio');
 
                // Load the profile owners pconfig.
-               $scheme           = PConfig::get($uid, 'frio', 'scheme');
+               $scheme           = PConfig::get($uid, 'frio', 'scheme', PConfig::get($uid, 'frio', 'schema'));
                $nav_bg           = PConfig::get($uid, 'frio', 'nav_bg');
                $nav_icon_color   = PConfig::get($uid, 'frio', 'nav_icon_color');
                $link_color       = PConfig::get($uid, 'frio', 'link_color');
@@ -38,7 +38,7 @@ if ($a->module !== 'install') {
                Config::load('frio');
 
                // Load frios system config.
-               $scheme           = Config::get('frio', 'scheme');
+               $scheme           = Config::get('frio', 'scheme', Config::get('frio', 'schema'));
                $nav_bg           = Config::get('frio', 'nav_bg');
                $nav_icon_color   = Config::get('frio', 'nav_icon_color');
                $link_color       = Config::get('frio', 'link_color');
@@ -63,7 +63,7 @@ if ($a->module !== 'install') {
 // Setting $scheme to '' wasn't working for some reason, so we'll check it's
 // not --- like the mobile theme does instead.
 // Allow layouts to over-ride the scheme.
-if (x($_REQUEST, 'scheme')) {
+if (!empty($_REQUEST['scheme'])) {
        $scheme = $_REQUEST['scheme'];
 }
 
@@ -110,6 +110,7 @@ if (empty($login_bg_image) && empty($login_bg_color)) {
        $login_bg_image = 'img/login_bg.jpg';
 }
 $login_bg_color   = (empty($login_bg_color)   ? '#ededed'      : $login_bg_color);
+$login_bg_image   = (empty($login_bg_image)   ? ''             : $login_bg_image);
 
 $contentbg_transp = ((isset($contentbg_transp) && $contentbg_transp != '') ? $contentbg_transp : 100);
 
@@ -224,7 +225,8 @@ header('ETag: "' . $etag . '"');
 header('Last-Modified: ' . $modified);
 
 // Only send the CSS file if it was changed.
-if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) || isset($_SERVER['HTTP_IF_NONE_MATCH'])) {
+/// @todo Check if this works at all (possibly clients are sending only the one or the other header) - compare with mod/photo.php
+if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && isset($_SERVER['HTTP_IF_NONE_MATCH'])) {
        $cached_modified = gmdate('r', strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']));
        $cached_etag = str_replace(['"', '-gzip'], ['', ''],
                                stripslashes($_SERVER['HTTP_IF_NONE_MATCH']));