From b6c1d7dc2bd02ea337d0ccc3171f47a371439bb5 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Thu, 29 May 2014 11:40:54 +0200
Subject: [PATCH] fetching the hostname from the .htpreconfig.php if present

---
 boot.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/boot.php b/boot.php
index 3a9e8c3e72..6c1016e1e8 100644
--- a/boot.php
+++ b/boot.php
@@ -428,6 +428,8 @@ if(! class_exists('App')) {
 
 			global $default_timezone, $argv, $argc;
 
+			$hostname = "";
+
 			if (file_exists(".htpreconfig.php"))
 				@include(".htpreconfig.php");
 
@@ -622,11 +624,16 @@ if(! class_exists('App')) {
 			if($parsed) {
 				$this->scheme = $parsed['scheme'];
 
-				$this->hostname = $parsed['host'];
+				$hostname = $parsed['host'];
 				if(x($parsed,'port'))
-					$this->hostname .= ':' . $parsed['port'];
+					$hostname .= ':' . $parsed['port'];
 				if(x($parsed,'path'))
 					$this->path = trim($parsed['path'],'\\/');
+
+				if (file_exists(".htpreconfig.php"))
+					@include(".htpreconfig.php");
+
+				$this->hostname = $hostname;
 			}
 
 		}