Merge pull request #15271 from seamuslee001/dev_drupal_52

dev/drupal#52 Partial fix for Deprecated q variable
civicrm · Sep 11, 2019 · cca4e41 · cca4e41
2 parents e3e784d + 165cf05
commit cca4e41
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/CRM/Utils/System/DrupalBase.php b/CRM/Utils/System/DrupalBase.php
@@ -673,9 +673,7 @@ public function getCurrentLanguage() {
    * @return bool
    */
   public function isFrontEndPage() {
-    // Get the menu items.
-    $args = explode('?', $_GET['q']);
-    $path = $args[0];
+    $path = CRM_Utils_System::getUrlPath();
 
     // Get the menu for above URL.
     $item = CRM_Core_Menu::get($path);