Merge pull request #14840 from MegaphoneJon/core-1130

[civicrm-core.git] / Civi / Core / Themes.php

diff --git a/Civi/Core/Themes.php b/Civi/Core/Themes.php
index 0413fde1a9f300c1c2d66b9ac456b3fe9f952b56..16968eb7a382469c0a9a4e1a3c39f29595a1d462 100644 (file)
--- a/Civi/Core/Themes.php
+++ b/Civi/Core/Themes.php
@@ -85,7 +85,7 @@ class Themes {
     if ($this->activeThemeKey === NULL) {
       // Ambivalent: is it better to use $config->userFrameworkFrontend or $template->get('urlIsPublic')?
       $config = \CRM_Core_Config::singleton();
-      $settingKey = $config->userFrameworkFrontend ? 'theme_frontend' : 'theme_backend';
+      $settingKey = $config->userSystem->isFrontEndPage() ? 'theme_frontend' : 'theme_backend';
 
       $themeKey = Civi::settings()->get($settingKey);
       if ($themeKey === 'default') {