From 708b8f216ea29f00b9f34b14f3359b6f651a83df Mon Sep 17 00:00:00 2001 From: Sofian Benaissa Date: Sat, 16 Apr 2011 19:11:16 -0400 Subject: [PATCH] Fixed quota use of old client fields --- modules/hosting/quota/hosting_quota.admin.inc | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/modules/hosting/quota/hosting_quota.admin.inc b/modules/hosting/quota/hosting_quota.admin.inc index cdcbfeb..e30eca4 100644 --- a/modules/hosting/quota/hosting_quota.admin.inc +++ b/modules/hosting/quota/hosting_quota.admin.inc @@ -5,7 +5,7 @@ function hosting_quota_admin_client_list() { $all_resources = module_invoke_all('hosting_quota_resource'); - $result = pager_query('SELECT q.*, c.name, c.email FROM {hosting_client_quota} q INNER JOIN {hosting_client} c ON c.nid = q.client', 23); + $result = pager_query('SELECT q.*, n.title FROM {hosting_client_quota} q INNER JOIN {node} n ON n.nid = q.client', 23); $output = array(); while ($row = db_fetch_object($result)) { @@ -20,12 +20,8 @@ function hosting_quota_admin_client_list() { $output[$row->client][$row->resource]['rendered usage'] = hosting_quota_resource_render($resource, $output[$row->client][$row->resource]['usage']); $output[$row->client][$row->resource]['rendered limit'] = hosting_quota_resource_render($resource, $row->value); - // Set client identifier, either e-mail or name - if (!$output[$row->client]['name'] && $row->name) { - $output[$row->client]['name'] = $row->name; - } else if (!$output[$row->client]['name']) { - $output[$row->client]['name'] = $row->email; - } + // Set client identifier + $output[$row->client]['name'] = $row->title; } return theme_hosting_quota_admin_list ($output, $all_resources); -- 1.5.6.5