2 files changed, 4 insertions, 4 deletions
diff --git a/modules/tag/controllers/admin_tags.php b/modules/tag/controllers/admin_tags.php
index ed4a0366..a56d4d20 100644
--- a/modules/tag/controllers/admin_tags.php
+++ b/modules/tag/controllers/admin_tags.php
@@ -19,7 +19,7 @@
  */
 class Admin_Tags_Controller extends Admin_Controller {
   public function index() {
-    $filter = $this->input->get("filter");
+    $filter = Input::instance()->get("filter");
 
     $view = new Admin_View("admin.html");
     $view->content = new View("admin_tags.html");
diff --git a/modules/tag/controllers/tags.php b/modules/tag/controllers/tags.php
index a44f6aa3..992c7411 100644
--- a/modules/tag/controllers/tags.php
+++ b/modules/tag/controllers/tags.php
@@ -21,7 +21,7 @@ class Tags_Controller extends Controller {
   public function show($tag_id) {
     $tag = ORM::factory("tag", $tag_id);
     $page_size = module::get_var("gallery", "page_size", 9);
-    $page = (int) $this->input->get("page", "1");
+    $page = (int) Input::instance()->get("page", "1");
     $children_count = $tag->items_count();
     $offset = ($page-1) * $page_size;
     $max_pages = max(ceil($children_count / $page_size), 1);
@@ -79,8 +79,8 @@ class Tags_Controller extends Controller {
 
   public function autocomplete() {
     $tags = array();
-    $tag_parts = preg_split("#,#", $this->input->get("q"));
-    $limit = $this->input->get("limit");
+    $tag_parts = preg_split("#,#", Input::instance()->get("q"));
+    $limit = Input::instance()->get("limit");
     $tag_part = end($tag_parts);
     $tag_list = ORM::factory("tag")
       ->where("name", "LIKE", "{$tag_part}%")