Merged revisions 3960-4065 from stable branch.

tbrehm

2013-07-31 615a0a96618fa99e7e452523145d6c0f238d4473

 interface/web/dns/dns_slave_list.php

@@ -16,9 +16,9 @@
$app->auth->check_module_permissions('dns');

$app->uses('listform_actions');
// $app->listform_actions->SQLExtWhere = "access = 'REJECT'";
// $app->listform_actions->SQLExtWhere = "dns_slave.access = 'REJECT'";

$app->listform_actions->SQLOrderBy = 'ORDER BY origin';
$app->listform_actions->SQLOrderBy = 'ORDER BY dns_slave.origin';
$app->listform_actions->onLoad();