[Fusionforge-commits] FusionForge branch master updated. 6.0.4-794-gecd743f

Franck Villaume nerville at libremir.placard.fr.eu.org
Fri Aug 26 14:42:26 CEST 2016


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, master has been updated
       via  ecd743fd61b17cc35cc497184714599a46f3b75f (commit)
      from  e274b6730f658f7d2cc772a74bc92dd13d1ad07c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=ecd743fd61b17cc35cc497184714599a46f3b75f

commit ecd743fd61b17cc35cc497184714599a46f3b75f
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Fri Aug 26 14:42:01 2016 +0200

    set https_port only when use_ssl & sett http_port if needed

diff --git a/src/common/include/utils.php b/src/common/include/utils.php
index e5024da..4c6a742 100644
--- a/src/common/include/utils.php
+++ b/src/common/include/utils.php
@@ -966,8 +966,14 @@ function util_url_prefix($prefix = '') {
 function util_make_base_url($prefix = '') {
 	$url = util_url_prefix($prefix);
 	$url .= forge_get_config('web_host');
-	if (forge_get_config('https_port') && (forge_get_config('https_port') != 443)) {
-		$url .= ":".forge_get_config('https_port');
+	if (forge_get_config('use_ssl')) {
+		if (forge_get_config('https_port') && (forge_get_config('https_port') != 443)) {
+			$url .= ":".forge_get_config('https_port');
+		}
+	} else {
+		if (forge_get_config('http_port') && (forge_get_config('http_port') != 80)) {
+			$url .= ":".forge_get_config('http_port');
+		}
 	}
 	return $url;
 }

-----------------------------------------------------------------------

Summary of changes:
 src/common/include/utils.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list