From e86a46d440a253aeb436b848e2c7e1370212ded0 Mon Sep 17 00:00:00 2001 From: Automatic Build Number Updater Date: Sat, 23 Apr 2011 07:43:24 -0700 Subject: Automated update of .build_number to 105 for branch master Last update: 7a4ff2fea194829eac38c6293b43cfa55d4637e1 (2 commits ago) --- .build_number | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.build_number b/.build_number index 0c29b4c8..bb29fe1f 100644 --- a/.build_number +++ b/.build_number @@ -3,4 +3,4 @@ ; process. You don't need to edit it. In fact.. ; ; DO NOT EDIT THIS FILE BY HAND! -build_number=104 +build_number=105 -- cgit v1.2.3 From 0ec819d38161ead063c4dbd953b4b55a33a42f80 Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Sat, 23 Apr 2011 07:46:38 -0700 Subject: Insure that the tag count to display is always greater than 0. Refixes #1649. --- modules/tag/helpers/tag.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) -- cgit v1.2.3 From 09030d527b2b107006b10b0541492c8e7ad6071b Mon Sep 17 00:00:00 2001 From: Automatic Build Number Updater Date: Sat, 23 Apr 2011 07:47:20 -0700 Subject: Automated update of .build_number to 106 for branch master Last update: 7a4ff2fea194829eac38c6293b43cfa55d4637e1 (3 commits ago) --- .build_number | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.build_number b/.build_number index bb29fe1f..0c634ab7 100644 --- a/.build_number +++ b/.build_number @@ -3,4 +3,4 @@ ; process. You don't need to edit it. In fact.. ; ; DO NOT EDIT THIS FILE BY HAND! -build_number=105 +build_number=106 -- cgit v1.2.3