From 5b3c29178704c047d4020df2ae445ff01c6e1f3a Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 22 Jun 2015 08:48:27 -0400
Subject: [PATCH] Merge branch 'master' into 'master'

---
 interface/web/sites/web_vhost_domain_edit.php |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/interface/web/sites/web_vhost_domain_edit.php b/interface/web/sites/web_vhost_domain_edit.php
index a4a5a39..c1a726a 100644
--- a/interface/web/sites/web_vhost_domain_edit.php
+++ b/interface/web/sites/web_vhost_domain_edit.php
@@ -647,7 +647,10 @@
 			//* we are editing a existing record
 			$app->tpl->setVar("edit_disabled", 1);
 			$app->tpl->setVar('fixed_folder', 'y');
-			if($this->_vhostdomain_type == 'domain') $app->tpl->setVar("server_id_value", $this->dataRecord["server_id"]);
+			if($this->_vhostdomain_type == 'domain') {
+				$app->tpl->setVar("server_id_value", $this->dataRecord["server_id"]);
+				$app->tpl->setVar("document_root", $this->dataRecord["document_root"]);
+			}
 			else $app->tpl->setVar('server_id_value', $parent_domain['server_id']);
 		} else {
 			$app->tpl->setVar("edit_disabled", 0);

--
Gitblit v1.9.1