Merge pull request #18397 from swastikpareek/issue-1987-fix-isFrontPa…

…ge-function dev/core#1987: Fix Drupal Base 'isFrontEndPage' function to consider Drupal public page for FE theme
civicrm · Sep 24, 2020 · 95c42d8 · 95c42d8
2 parents 8ea41c7 + 446bb2d
commit 95c42d8
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']));
   }
 
   /**