Merged revisions 3960-4065 from stable branch.

tbrehm

2013-07-31 615a0a96618fa99e7e452523145d6c0f238d4473

 interface/web/sites/web_vhost_subdomain_list.php

@@ -47,8 +47,8 @@
$app->uses('listform_actions');

// Limit the results to alias domains
$app->listform_actions->SQLExtWhere = "type = 'vhostsubdomain'";
$app->listform_actions->SQLOrderBy = 'ORDER BY domain';
$app->listform_actions->SQLExtWhere = "web_domain.type = 'vhostsubdomain'";
$app->listform_actions->SQLOrderBy = 'ORDER BY web_domain.domain';
$app->listform_actions->onLoad();