diff options
| author | Romain LE DISEZ <romain.git@ledisez.net> | 2009-07-25 13:59:04 +0200 |
|---|---|---|
| committer | Romain LE DISEZ <romain.git@ledisez.net> | 2009-07-25 13:59:04 +0200 |
| commit | 0aa3ec3ae90a101b2bfc1b395a1749551da22287 (patch) | |
| tree | 02702942bc27e0e4e7b634a56cd35b71cb35fecc /modules/tag/models | |
| parent | b181707c1651af8737c2e6ff550fd20f480b781b (diff) | |
| parent | 50d6cc0150b930d79d3e8b90956ffa9655fcc9c5 (diff) | |
Merge commit 'upstream/master'
Diffstat (limited to 'modules/tag/models')
| -rw-r--r-- | modules/tag/models/tag.php | 10 |
1 files changed, 7 insertions, 3 deletions
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 |