From 615a0a96618fa99e7e452523145d6c0f238d4473 Mon Sep 17 00:00:00 2001 From: tbrehm <t.brehm@ispconfig.org> Date: Wed, 31 Jul 2013 09:33:43 -0400 Subject: [PATCH] Merged revisions 3960-4065 from stable branch. --- interface/web/client/reseller_list.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/web/client/reseller_list.php b/interface/web/client/reseller_list.php index fa819e6..fd8fca0 100644 --- a/interface/web/client/reseller_list.php +++ b/interface/web/client/reseller_list.php @@ -47,8 +47,8 @@ $app->uses('listform_actions'); -$app->listform_actions->SQLOrderBy = 'ORDER BY company_name, contact_name, client_id'; -$app->listform_actions->SQLExtWhere = "(limit_client > 0 or limit_client = -1)"; +$app->listform_actions->SQLOrderBy = 'ORDER BY client.company_name, client.contact_name, client.client_id'; +$app->listform_actions->SQLExtWhere = "(client.limit_client > 0 or client.limit_client = -1)"; $app->listform_actions->SQLExtSelect = ', client.country as countryiso'; $app->listform_actions->onLoad(); -- Gitblit v1.9.1