- PConfig::load($uid, 'frio');
-
- // Load the profile owners pconfig.
- $scheme = PConfig::get($uid, 'frio', 'scheme', PConfig::get($uid, 'frio', 'schema'));
- \Friendica\Core\Logger::alert($scheme);
- $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');
- $background_color = PConfig::get($uid, 'frio', 'background_color');
- $contentbg_transp = PConfig::get($uid, 'frio', 'contentbg_transp');
- $background_image = PConfig::get($uid, 'frio', 'background_image');
- $bg_image_option = PConfig::get($uid, 'frio', 'bg_image_option');
- $modified = PConfig::get($uid, 'frio', 'css_modified');
-
- // There is maybe the case that the user did never modify the theme settings.
- // In this case we store the present time.
- if (empty($modified)) {
- PConfig::set($uid, 'frio', 'css_modified', time());
- }
- } else {
- Config::load('frio');
-
- // Load frios system config.
- $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');
- $background_color = Config::get('frio', 'background_color');
- $contentbg_transp = Config::get('frio', 'contentbg_transp');
- $background_image = Config::get('frio', 'background_image');
- $bg_image_option = Config::get('frio', 'bg_image_option');
- $login_bg_image = Config::get('frio', 'login_bg_image');
- $login_bg_color = Config::get('frio', 'login_bg_color');
- $modified = Config::get('frio', 'css_modified');
-
- // There is maybe the case that the user did never modify the theme settings.
- // In this case we store the present time.
- if (empty($modified)) {
- Config::set('frio', 'css_modified', time());
- }
+ DI::pConfig()->load($uid, 'frio');
+
+ // Only override display settings that have actually been set
+ $scheme = DI::pConfig()->get($uid, 'frio', 'scheme', DI::pConfig()->get($uid, 'frio', 'schema')) ?: $scheme;
+ $scheme_accent = DI::pConfig()->get($uid, 'frio', 'scheme_accent') ?: $scheme_accent;
+ $nav_bg = DI::pConfig()->get($uid, 'frio', 'nav_bg') ?: $nav_bg;
+ $nav_icon_color = DI::pConfig()->get($uid, 'frio', 'nav_icon_color') ?: $nav_icon_color;
+ $link_color = DI::pConfig()->get($uid, 'frio', 'link_color') ?: $link_color;
+ $background_color = DI::pConfig()->get($uid, 'frio', 'background_color') ?: $background_color;
+ $contentbg_transp = DI::pConfig()->get($uid, 'frio', 'contentbg_transp') ?? $contentbg_transp;
+ $background_image = DI::pConfig()->get($uid, 'frio', 'background_image') ?: $background_image;
+ $bg_image_option = DI::pConfig()->get($uid, 'frio', 'bg_image_option') ?: $bg_image_option;
+ $modified = DI::pConfig()->get($uid, 'frio', 'css_modified') ?: $modified;