diff --git a/addons/default/visiosoft/advs-module/src/Adv/Command/appendRequestURL.php b/addons/default/visiosoft/advs-module/src/Adv/Command/appendRequestURL.php index af6962551..fbba5a48d 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/Command/appendRequestURL.php +++ b/addons/default/visiosoft/advs-module/src/Adv/Command/appendRequestURL.php @@ -30,18 +30,18 @@ class appendRequestURL { if (count($this->new_parameters) === 0 && count($this->request) === 0) { return $this->url; - } elseif (count($this->request) > 0) { - return $this->url - . (Str::contains($this->url, '?') ? '&' : '?') - . Arr::query($this->appends($this->request)); - } elseif (count($this->new_parameters) > 0) { - return $this->url - . (Str::contains($this->url, '?') ? '&' : '?') - . Arr::query($this->appends($this->new_parameters)); - } else { + } elseif (count($this->new_parameters) > 0 && count($this->request) > 0) { return $this->url . (Str::contains($this->url, '?') ? '&' : '?') . Arr::query($this->appends(array_merge($this->request, $this->new_parameters))); + } elseif (count($this->new_parameters) > 0 && count($this->request) === 0) { + return $this->url + . (Str::contains($this->url, '?') ? '&' : '?') + . Arr::query($this->appends($this->new_parameters)); + } elseif (count($this->new_parameters) === 0 && count($this->request) > 0) { + return $this->url + . (Str::contains($this->url, '?') ? '&' : '?') + . Arr::query($this->appends($this->request)); } }