Merge pull request #17474 from eileenmcnaughton/processor_name

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

diff --git a/Civi/Core/Themes.php b/Civi/Core/Themes.php
index f7118d69d3d13a6605c521f26cc30dea5958bc04..8e7dc5988dc4e81904cd713ee6776b22f9b05c58 100644 (file)
--- 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;
   }
 
   /**