summaryrefslogtreecommitdiff
path: root/modules/server_add/controllers
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2013-02-17 00:23:50 -0500
committerBharat Mediratta <bharat@menalto.com>2013-02-17 00:23:50 -0500
commitd632ef3e50252d388c272cacd29e8cc6e4949cec (patch)
tree2e8de0122a089d6205dd60e60e5fd2f6ded87138 /modules/server_add/controllers
parentcc45e2e33b07cd27a87300f5d239394a14569308 (diff)
Fix up autocomplete for admin_server_add - found and fixed some bugs
in gallery_autocomplete when "multiple" isn't set. Fixed some harmless syntax issues that js2-mode helpfully pointed out.
Diffstat (limited to 'modules/server_add/controllers')
-rw-r--r--modules/server_add/controllers/admin_server_add.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/server_add/controllers/admin_server_add.php b/modules/server_add/controllers/admin_server_add.php
index ba2b9b3f..4e522702 100644
--- a/modules/server_add/controllers/admin_server_add.php
+++ b/modules/server_add/controllers/admin_server_add.php
@@ -73,14 +73,14 @@ class Admin_Server_Add_Controller extends Admin_Controller {
public function autocomplete() {
$directories = array();
- $path_prefix = Input::instance()->get("q");
+ $path_prefix = Input::instance()->get("term");
foreach (glob("{$path_prefix}*") as $file) {
if (is_dir($file) && !is_link($file)) {
- $directories[] = html::clean($file);
+ $directories[] = (string)html::clean($file);
}
}
- ajax::response(implode("\n", $directories));
+ ajax::response(json_encode($directories));
}
private function _get_admin_form() {