X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Ftheme%2Ffrio%2Fstyle.php;h=d8bffa9c645c4ff048b0b329a2927f7e32d2d4e9;hb=4facd1dfdba93ede48ca40b5e146424e6701118b;hp=621f5d0ccec8ef6f749ff7257dce52179b8bb042;hpb=0c0b715c633f78467f82fdb1d69c230aaef765ce;p=friendica.git

diff --git a/view/theme/frio/style.php b/view/theme/frio/style.php
index 621f5d0cce..d8bffa9c64 100644
--- a/view/theme/frio/style.php
+++ b/view/theme/frio/style.php
@@ -14,7 +14,7 @@ $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');
 
@@ -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']));