X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Ftheme%2Ffrio%2Fstyle.php;h=e0f65960f6886e620feafd8a4aad89c019daec15;hb=54aee2aaa7500e0af6d032e75362ad1d1a5dc0f1;hp=393dca2f900d62aa61cd70c868b6e31ecd5c6862;hpb=86e4690b5f4c5e8ac765b034c1ef25ef4a1669c6;p=friendica.git

diff --git a/view/theme/frio/style.php b/view/theme/frio/style.php
index 393dca2f90..e0f65960f6 100644
--- a/view/theme/frio/style.php
+++ b/view/theme/frio/style.php
@@ -19,7 +19,7 @@ if ($a->module !== 'install') {
 		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');
@@ -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']));