summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--modules/user/controllers/admin_users.php7
-rw-r--r--modules/user/views/admin_users.html.php2
2 files changed, 3 insertions, 6 deletions
diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index e11145de..8dbc4cbb 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -43,14 +43,11 @@ class Admin_Users_Controller extends Admin_Controller {
url::redirect(url::merge(array("page" => $view->content->pager->total_pages)));
}
+ // Join our users against the items table so that we can get a count of their items
+ // in the same query.
$view->content->users = ORM::factory("user")
- ->select(array("users.id", "users.admin", "users.name", "users.email", "users.full_name",
- "users.last_login", "users.guest", db::expr("COUNT(items.id) as item_count")))
- ->join("items", "items.owner_id", "users.id", "LEFT")
- ->group_by("users.id")
->order_by("users.name", "ASC")
->find_all($page_size, $view->content->pager->sql_offset);
-
$view->content->groups = ORM::factory("group")->order_by("name", "ASC")->find_all();
print $view;
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index 74b13ec5..a7bd6b27 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -88,7 +88,7 @@
<?= ($user->last_login == 0) ? "" : gallery::date($user->last_login) ?>
</td>
<td>
- <?= $user->item_count ?>
+ <?= db::build()->from("items")->where("owner_id", "=", $user->id)->count_records() ?>
</td>
<td>
<a href="<?= url::site("admin/users/edit_user_form/$user->id") ?>"