dev/core#1987 Fix Drupal Base 'isFrontEndPage' function

civicrm · Sep 7, 2020 · 446bb2d · 446bb2d
1 parent 383d2ac
commit 446bb2d
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/CRM/Utils/System/DrupalBase.php b/CRM/Utils/System/DrupalBase.php
@@ -660,7 +660,8 @@ public function isFrontEndPage() {
 
     // Get the menu for above URL.
     $item = CRM_Core_Menu::get($path);
-    return !empty($item['is_public']);
+    // In case the URL is not a civicrm page (a drupal page) we set the FE theme to TRUE - covering the corner case
+    return (empty($item) || !empty($item['is_public']));
   }
 
   /**