From 67190412e6e3196eeb43aab4bb86b970cdf1595c Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Thu, 23 Jul 2009 11:57:34 -0700 Subject: Respect the $type parameter on Tag_Model::items_count() --- modules/tag/models/tag.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'modules/tag/models') diff --git a/modules/tag/models/tag.php b/modules/tag/models/tag.php index 7a85dbab..e910a8ee 100644 --- a/modules/tag/models/tag.php +++ b/modules/tag/models/tag.php @@ -44,10 +44,14 @@ class Tag_Model extends ORM { * @return integer */ public function items_count($type=null) { - return ORM::factory("item") + $model = ORM::factory("item") ->viewable() ->join("items_tags", "items.id", "items_tags.item_id") - ->where("items_tags.tag_id", $this->id) - ->count_all(); + ->where("items_tags.tag_id", $this->id); + + if ($type) { + $model->where("items.type", $type); + } + return $model->count_all(); } } \ No newline at end of file -- cgit v1.2.3