diff options
| author | Nathan Kinkade <nkinkade@nkinka.de> | 2010-01-03 15:51:24 +0000 |
|---|---|---|
| committer | Nathan Kinkade <nkinkade@nkinka.de> | 2010-01-03 15:51:24 +0000 |
| commit | 399abbc3a754cf5fdcfdff113446e1bc264091e2 (patch) | |
| tree | 592188568e15325d59e51bf19cfdf667fae8d86d /modules/search/controllers | |
| parent | 925a6a2220760cb7daacee1ab80a07b61b3a30a1 (diff) | |
| parent | 64e5efd57ba1479179c202e1b76b6eeb42d2924c (diff) | |
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'modules/search/controllers')
| -rw-r--r-- | modules/search/controllers/search.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/search/controllers/search.php b/modules/search/controllers/search.php index 2f1aeb76..ea870847 100644 --- a/modules/search/controllers/search.php +++ b/modules/search/controllers/search.php @@ -20,8 +20,8 @@ class Search_Controller extends Controller { public function index() { $page_size = module::get_var("gallery", "page_size", 9); - $q = $this->input->get("q"); - $page = $this->input->get("page", 1); + $q = Input::instance()->get("q"); + $page = Input::instance()->get("page", 1); $offset = ($page - 1) * $page_size; // Make sure that the page references a valid offset |