Fix `Generator::linkOrButton` issue after merge

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>

1 files changed, 2 insertions, 2 deletions

diff --git a/libraries/classes/Html/Generator.php b/libraries/classes/Html/Generator.php
index 01b2e0de00..0e5667200f 100644
--- a/libraries/classes/Html/Generator.php
+++ b/libraries/classes/Html/Generator.php
@@ -1113,7 +1113,7 @@ class Generator
     ): string {
         $url = $urlPath;
         if (is_array($urlParams)) {
-            $url = $urlPath . Url::getCommon($urlParams, '?', false);
+            $url = $urlPath . Url::getCommon($urlParams, strpos($urlPath, '?') !== false ? '&' : '?', false);
         }
 
         $url_length = strlen($url);
@@ -1180,7 +1180,7 @@ class Generator
         } else {
             $url = $urlPath;
             if (is_array($urlParams)) {
-                $url = $urlPath . Url::getCommon($urlParams);
+                $url = $urlPath . Url::getCommon($urlParams, strpos($urlPath, '?') !== false ? '&' : '?');
             }
         }