Merged revisions from 3.0.5 stable branch: 3758-3768, 3769 shall not be mer...

tbrehm

2013-01-17 43b345cabb3e8743a91c39e8d6367c1aa594ebd2

 interface/web/sites/web_subdomain_edit.php

@@ -147,6 +147,11 @@
        } else {
            $this->dataRecord["domain"] = $this->dataRecord["domain"].'.'.$parent_domain["domain"];
        }
		
      // nginx: if redirect type is proxy and redirect path is no URL, display error
      if($this->dataRecord["redirect_type"] == 'proxy' && substr($this->dataRecord['redirect_path'],0,1) == '/'){
         $app->tform->errorMessage .= $app->tform->lng("error_proxy_requires_url")."<br />";
      }
        
      // Set a few fixed values
      $this->dataRecord["type"] = 'subdomain';