Merge pull request #24192 from demeritcowboy/php81-frontend4

[php 8.1 compat] Avoid CRM_Utils_System::url null for $query param
civicrm · Aug 9, 2022 · 9a397a7 · 9a397a7
2 parents b75b95b + cbb4fa5
commit 9a397a7
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/CRM/Utils/System/DrupalBase.php b/CRM/Utils/System/DrupalBase.php
@@ -171,16 +171,16 @@ public function url(
     $separator = '&';
 
     if (!$config->cleanURL) {
-      if (isset($path)) {
-        if (isset($query)) {
+      if ($path !== NULL && $path !== '' && $path !== FALSE) {
+        if ($query !== NULL && $query !== '' && $query !== FALSE) {
           return $base . $script . '?q=' . $path . $separator . $query . $fragment;
         }
         else {
           return $base . $script . '?q=' . $path . $fragment;
         }
       }
       else {
-        if (isset($query)) {
+        if ($query !== NULL && $query !== '' && $query !== FALSE) {
           return $base . $script . '?' . $query . $fragment;
         }
         else {
@@ -189,16 +189,16 @@ public function url(
       }
     }
     else {
-      if (isset($path)) {
-        if (isset($query)) {
+      if ($path !== NULL && $path !== '' && $path !== FALSE) {
+        if ($query !== NULL && $query !== '' && $query !== FALSE) {
           return $base . $path . '?' . $query . $fragment;
         }
         else {
           return $base . $path . $fragment;
         }
       }
       else {
-        if (isset($query)) {
+        if ($query !== NULL && $query !== '' && $query !== FALSE) {
           return $base . $script . '?' . $query . $fragment;
         }
         else {