remove odd code, align to master

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

1 files changed, 3 insertions, 6 deletions

diff --git a/lib/private/Http/Client/Client.php b/lib/private/Http/Client/Client.php
index 3b89af31f93..0dde56b28f9 100644
--- a/lib/private/Http/Client/Client.php
+++ b/lib/private/Http/Client/Client.php
@@ -114,21 +114,18 @@ class Client implements IClient {
 	 */
 	private function getProxyUri(): ?string {
 		$proxyHost = $this->config->getSystemValue('proxy', '');
+
 		if ($proxyHost === '' || $proxyHost === null) {
 			return null;
 		}
 
 		$proxyUserPwd = $this->config->getSystemValue('proxyuserpwd', '');
-		$proxyUri = '';
 
 		if ($proxyUserPwd === '' || $proxyUserPwd === null) {
-			$proxyUri .= $proxyUserPwd . '@';
-		}
-		if ($proxyHost !== null) {
-			$proxyUri .= $proxyHost;
+			return $proxyHost;
 		}
 
-		return $proxyUri;
+		return $proxyUserPwd . '@' . $proxyHost;
 	}
 
 	/**