X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=Civi%2FCore%2FThemes.php;h=8e7dc5988dc4e81904cd713ee6776b22f9b05c58;hb=6e32198b6bcc4d93e62b6d033e356104da3e9b0f;hp=f7118d69d3d13a6605c521f26cc30dea5958bc04;hpb=b46379c1a2a975fe0c5142d40ed03f19578844a7;p=civicrm-core.git

diff --git a/Civi/Core/Themes.php b/Civi/Core/Themes.php
index f7118d69d3..8e7dc5988d 100644
--- a/Civi/Core/Themes.php
+++ b/Civi/Core/Themes.php
@@ -78,7 +78,7 @@ class Themes {
 
       \CRM_Utils_Hook::activeTheme($themeKey, [
         'themes' => $this,
-        'page' => \CRM_Utils_Array::value(\CRM_Core_Config::singleton()->userFrameworkURLVar, $_GET),
+        'page' => \CRM_Utils_System::currentPath(),
       ]);
 
       $themes = $this->getAll();
@@ -97,7 +97,7 @@ class Themes {
    */
   public function get($themeKey) {
     $all = $this->getAll();
-    return isset($all[$themeKey]) ? $all[$themeKey] : NULL;
+    return $all[$themeKey] ?? NULL;
   }
 
   /**