Skip to content

Commit 116afb1

Browse files
author
Till Brehm
committed
Merge branch '6592-website-edit-after-an-validations-error-example-write-xxx-into-quota-and-save-than' into 'develop'
Resolve "Website edit - after an validations error (example write xxx into Quota and save) than document_root is empty" Closes #6692 and #6592 See merge request ispconfig/ispconfig3!1917
2 parents 8197493 + 9db5fa5 commit 116afb1

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

interface/web/sites/web_vhost_domain_edit.php

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -673,9 +673,17 @@ function onShowEnd() {
673673
$app->tpl->setVar('fixed_folder', 'y');
674674
if($this->_vhostdomain_type == 'domain') {
675675
$app->tpl->setVar("server_id_value", $this->dataRecord["server_id"], true);
676-
$app->tpl->setVar("document_root", $this->dataRecord["document_root"], true);
677-
}
678-
else $app->tpl->setVar('server_id_value', $parent_domain['server_id']);
676+
if(isset($this->dataRecord["document_root"])) {
677+
$app->tpl->setVar("document_root", $this->dataRecord["document_root"], true);
678+
} else {
679+
$tmp = $app->tform->getDataRecord($this->id);
680+
$app->tpl->setVar("document_root", $tmp["document_root"], true);
681+
unset($tmp);
682+
}
683+
684+
} else {
685+
$app->tpl->setVar('server_id_value', $parent_domain['server_id']);
686+
}
679687
} else {
680688
$app->tpl->setVar("edit_disabled", 0);
681689
$app->tpl->setVar('fixed_folder', 'n');

0 commit comments

Comments
 (0)