aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorFabio Comuni <fabrix.xm@gmail.com>2011-07-29 17:23:09 +0200
committerFabio Comuni <fabrix.xm@gmail.com>2011-07-29 17:23:09 +0200
commitac6945eed1644e7a9e58c5f74dae696ff0f09d72 (patch)
treeb3b13f5569869a2feffb3990ea8e33313f789e5e /boot.php
parentb1e766dadb1d4a9e727b2d1d5f32442392ac6bd3 (diff)
parentf47d582736ddf24528dd514850d4bed76783f589 (diff)
downloadvolse-hubzilla-ac6945eed1644e7a9e58c5f74dae696ff0f09d72.tar.gz
volse-hubzilla-ac6945eed1644e7a9e58c5f74dae696ff0f09d72.tar.bz2
volse-hubzilla-ac6945eed1644e7a9e58c5f74dae696ff0f09d72.zip
Merge remote-tracking branch 'friendika/master'
Diffstat (limited to 'boot.php')
-rw-r--r--boot.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/boot.php b/boot.php
index a5ce5f5c3..956cb2ca6 100644
--- a/boot.php
+++ b/boot.php
@@ -1,6 +1,6 @@
<?php
-define ( 'FRIENDIKA_VERSION', '2.2.1047' );
+define ( 'FRIENDIKA_VERSION', '2.2.1055' );
define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
define ( 'DB_UPDATE_VERSION', 1076 );
@@ -270,7 +270,8 @@ class App {
if(x($_SERVER,'SERVER_NAME')) {
$this->hostname = $_SERVER['SERVER_NAME'];
-
+ if(x($_SERVER,'SERVER_PORT') && $_SERVER['SERVER_PORT'] != 80 && $_SERVER['SERVER_PORT'] != 443)
+ $this->hostname .= ':' . $_SERVER['SERVER_PORT'];
/**
* Figure out if we are running at the top of a domain
* or in a sub-directory and adjust accordingly