From 6250b7ea002fd99e40d0170d31e7e19e69f97ccd Mon Sep 17 00:00:00 2001 From: Dominik <info@profi-webdesign.net> Date: Thu, 23 Jan 2014 13:53:43 -0500 Subject: [PATCH] Merge remote-tracking branch 'ispc3master/master' --- server/lib/classes/aps_installer.inc.php | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/server/lib/classes/aps_installer.inc.php b/server/lib/classes/aps_installer.inc.php index 2925c7a..5fac926 100644 --- a/server/lib/classes/aps_installer.inc.php +++ b/server/lib/classes/aps_installer.inc.php @@ -277,7 +277,8 @@ if(substr($this->document_root, -1) != '/') $this->document_root .= '/'; // Attention: ISPConfig Special: web files are in subfolder 'web' -> append it: - if($domain_res['type'] == 'vhostsubdomain') $this->document_root .= $domain_res['web_folder'] . '/'; + if(($domain_res['type'] == 'vhostsubdomain') || ($domain_res['type'] == 'vhostalias')) + $this->document_root .= $domain_res['web_folder'] . '/'; else $this->document_root .= 'web/'; // If a subfolder is given, make sure it's path doesn't begin with / i.e. /phpbb -- Gitblit v1.9.1