From 6d9130ef844686dfc236bc449d166145fa2c9344 Mon Sep 17 00:00:00 2001
From: Paul B <paul@bonaud.fr>
Date: Tue, 16 Apr 2019 16:04:27 +0200
Subject: [PATCH] refacto(utils): remove a useless intermediate variable
This is the commit of the suggestion I made here:
https://framagit.org/framasoft/framadate/framadate/merge_requests/344/diffs#note_399810
---
app/classes/Framadate/Utils.php | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/app/classes/Framadate/Utils.php b/app/classes/Framadate/Utils.php
index c7d146c1..88f9fa60 100644
--- a/app/classes/Framadate/Utils.php
+++ b/app/classes/Framadate/Utils.php
@@ -34,15 +34,13 @@ class Utils {
(isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https')
) ? 'https' : 'http';
+ $domain = defined('APP_URL') ? APP_URL : $serverName;
$port = in_array($serverPort, ['80', '443'], true) ? '' : ':' . $serverPort;
$dirname = dirname($_SERVER['SCRIPT_NAME']);
$dirname = $dirname === '\\' ? '/' : $dirname . '/';
$dirname = str_replace('/admin', '', $dirname);
$dirname = str_replace('/action', '', $dirname);
- $appUrlConfig = defined('APP_URL') ? APP_URL : '';
- $domain = $appUrlConfig === '' ? $serverName : $appUrlConfig;
-
return $scheme . '://' . preg_replace('#//+#', '/', $domain . $port . $dirname);
}
--
GitLab