summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2011-04-23 08:08:43 -0700
committerBharat Mediratta <bharat@menalto.com>2011-04-23 08:08:43 -0700
commit993e49adda302c89ae84f8667fd2169f71b635d4 (patch)
tree6ab0e5e10603949180f41fcc7bfadd18dcc7e3d2 /modules
parent3312009319d69dc834e705166ac08ad8bdc4c18e (diff)
parent09030d527b2b107006b10b0541492c8e7ad6071b (diff)
Merge branch 'master' of github.com:gallery/gallery3
Diffstat (limited to 'modules')
-rw-r--r--modules/tag/helpers/tag.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/tag/helpers/tag.php b/modules/tag/helpers/tag.php
index 742783d1..c21104ee 100644
--- a/modules/tag/helpers/tag.php
+++ b/modules/tag/helpers/tag.php
@@ -48,7 +48,7 @@ class tag_Core {
* @return ORM_Iterator of Tag_Model in descending tag count order
*/
static function popular_tags($count) {
- $count = $count >= 1 ? $count : 30;
+ $count = max($count, 1);
return ORM::factory("tag")
->order_by("count", "DESC")
->limit($count)