Merge branch 'master' into 'stable-3.1'

Master

Fixes #3731 

See merge request !286

interface/web/sites/web_vhost_domain_edit.php

@@ -1398,7 +1398,7 @@ class page_action extends tform_actions {
 			} else {
 				//* We do not allow users to change a domain which has been created by the admin
 				$rec = $app->db->queryOneRecord("SELECT sys_perm_group, domain, ip_address, ipv6_address from web_domain WHERE domain_id = ?", $this->id);
-				if(isset($this->dataRecord["domain"]) && $rec['domain'] != $this->dataRecord["domain"] && $app->tform->checkPerm($this->id, 'u')) {
+				if(isset($this->dataRecord["domain"]) && $rec['domain'] != $this->dataRecord["domain"] && !$app->tform->checkPerm($this->id, 'u')) {
 					//* Add a error message and switch back to old server
 					$app->tform->errorMessage .= $app->lng('The Domain can not be changed. Please ask your Administrator if you want to change the domain name.');
 					$this->dataRecord["domain"] = $rec['domain'];