summaryrefslogtreecommitdiff
path: root/modules/search
diff options
context:
space:
mode:
authorChad Kieffer <ckieffer@gmail.com>2011-01-04 15:59:26 -0700
committerChad Kieffer <ckieffer@gmail.com>2011-01-04 15:59:26 -0700
commite921c3c5b5b8f963f121601d346c50a24bc0cf15 (patch)
treea29064762c3b37812596cb82c3e910f7321a85b2 /modules/search
parentdbff45cc91ac44f18ef02b8abdd220a2864f050f (diff)
parentd74aad072d8ccca70efb1c8b673e8368566a1974 (diff)
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'modules/search')
-rw-r--r--modules/search/controllers/search.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/search/controllers/search.php b/modules/search/controllers/search.php
index e5894f30..733bc9f7 100644
--- a/modules/search/controllers/search.php
+++ b/modules/search/controllers/search.php
@@ -34,10 +34,10 @@ class Search_Controller extends Controller {
$max_pages = max(ceil($count / $page_size), 1);
$template = new Theme_View("page.html", "collection", "search");
- $template->set_global("page", $page);
- $template->set_global("max_pages", $max_pages);
- $template->set_global("page_size", $page_size);
- $template->set_global("children_count", $count);
+ $template->set_global(array("page" => $page,
+ "max_pages" => $max_pages,
+ "page_size" => $page_size,
+ "children_count" => $count));
$template->content = new View("search.html");
$template->content->items = $result;