public/gallery3-contrib
Archived
1
0
Fork 0
Code Releases Activity

When the display limit is specified, but there less than the display limit items, then use the item count as the display limit.

Browse Source
This commit is contained in:
Tim Almdal 2011-06-02 21:33:05 -07:00
parent 246cf60db7
commit fd55451395
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
3.0/modules/dynamic/controllers/dynamic.php
View File

@ -30,12 +30,14 @@ class Dynamic_Controller extends Controller {
$page = Input::instance()->get("page", "1");
$album_defn = unserialize(module::get_var("dynamic", $album));
$children_count = $album_defn->limit;
if (empty($children_count)) {
$display_limit = $album_defn->limit;
if (empty($display_limit)) {
$children_count = ORM::factory("item")
->viewable()
->where("type", "!=", "album")
->count_all();
} else {
$children_count = $display_limit;
}
$offset = ($page-1) * $page_size;

6
3.1/modules/dynamic/controllers/dynamic.php
View File

@ -30,12 +30,14 @@ class Dynamic_Controller extends Controller {
$page = Input::instance()->get("page", "1");
$album_defn = unserialize(module::get_var("dynamic", $album));
$children_count = $album_defn->limit;
if (empty($children_count)) {
$display_limit = $album_defn->limit;
if (empty($display_limit)) {
$children_count = ORM::factory("item")
->viewable()
->where("type", "!=", "album")
->count_all();
} else {
$children_count = $display_limit;
}
$offset = ($page-1) * $page_size;