From: Swastik Pareek <swastik@compucorp.co.uk>
Date: Wed, 2 Sep 2020 12:40:33 +0000 (+0100)
Subject: dev/core#1987 Fix Drupal Base 'isFrontEndPage' function
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=446bb2d5c7d18638baf60dda45a95a1e730a7f48;p=civicrm-core.git

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

diff --git a/CRM/Utils/System/DrupalBase.php b/CRM/Utils/System/DrupalBase.php
index aeef820d20..9234c87d75 100644
--- a/CRM/Utils/System/DrupalBase.php
+++ b/CRM/Utils/System/DrupalBase.php
@@ -660,7 +660,8 @@ abstract class CRM_Utils_System_DrupalBase extends CRM_Utils_System_Base {
 
     // 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']));
   }
 
   /**