Merge remote-tracking branch 'renky/vhostalias'

Marius Cramer

2014-01-24 e60d4c7e35e5dd3a5f4fb1d5b3a25345b6275146

 interface/web/sites/web_childdomain_edit.php

@@ -81,7 +81,7 @@
            if(!$app->tform->checkClientLimit('limit_web_aliasdomain', "(type = 'alias' OR type = 'vhostalias')")) {
               $app->error($app->tform->wordbook["limit_web_aliasdomain_txt"]);
            }
            if(!$app->tform->checkResellerLimit('limit_web_aliasdomain', "type = 'alias'")) {
            if(!$app->tform->checkResellerLimit('limit_web_aliasdomain', "(type = 'alias' OR type = 'vhostalias')")) {
               $app->error('Reseller: '.$app->tform->wordbook["limit_web_aliasdomain_txt"]);
            }
         }