diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2011-04-23 07:42:54 -0700 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2011-04-23 07:42:54 -0700 |
| commit | aa949003545c50c1d2175167b8f69ae65d6dc217 (patch) | |
| tree | 5e7a5260bf57d76904cac4bd135dca72743c8363 | |
| parent | 171e4fd0ee6493bb82bb1de3017b83319e7fc5e4 (diff) | |
| parent | 6b90b8e7f6ac2b641aa5a1da173ea3191c1921e3 (diff) | |
Merge branch 'master' of github.com:gallery/gallery3
| -rw-r--r-- | .build_number | 2 | ||||
| -rw-r--r-- | modules/tag/helpers/tag.php | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/.build_number b/.build_number index 05667d5e..0c29b4c8 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=103 +build_number=104 diff --git a/modules/tag/helpers/tag.php b/modules/tag/helpers/tag.php index 733215b3..742783d1 100644 --- a/modules/tag/helpers/tag.php +++ b/modules/tag/helpers/tag.php @@ -48,6 +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; return ORM::factory("tag") ->order_by("count", "DESC") ->limit($count) |