Merge branch 'master' of git://github.com/gallery/gallery3

1 files changed, 2 insertions, 2 deletions

diff --git a/modules/server_add/controllers/admin_server_add.php b/modules/server_add/controllers/admin_server_add.php
index f32bb834..17c3f68b 100644
--- a/modules/server_add/controllers/admin_server_add.php
+++ b/modules/server_add/controllers/admin_server_add.php
@@ -58,7 +58,7 @@ class Admin_Server_Add_Controller extends Admin_Controller {
   public function remove_path() {
     access::verify_csrf();
 
-    $path = $this->input->get("path");
+    $path = Input::instance()->get("path");
     $paths = unserialize(module::get_var("server_add", "authorized_paths"));
     if (isset($paths[$path])) {
       unset($paths[$path]);
@@ -71,7 +71,7 @@ class Admin_Server_Add_Controller extends Admin_Controller {
 
   public function autocomplete() {
     $directories = array();
-    $path_prefix = $this->input->get("q");
+    $path_prefix = Input::instance()->get("q");
     foreach (glob("{$path_prefix}*") as $file) {
       if (is_dir($file) && !is_link($file)) {
         $directories[] = $file;