diff options
| -rw-r--r-- | modules/g2_import/controllers/admin_g2_import.php | 6 | ||||
| -rw-r--r-- | modules/g2_import/views/admin_g2_import.html.php | 5 |
2 files changed, 4 insertions, 7 deletions
diff --git a/modules/g2_import/controllers/admin_g2_import.php b/modules/g2_import/controllers/admin_g2_import.php index c4f03907..08007b85 100644 --- a/modules/g2_import/controllers/admin_g2_import.php +++ b/modules/g2_import/controllers/admin_g2_import.php @@ -101,10 +101,10 @@ class Admin_g2_import_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)) { - $file = html::clean($file); + $file = (string)html::clean($file); $directories[] = $file; // If we find an embed.php, include it as well @@ -114,7 +114,7 @@ class Admin_g2_import_Controller extends Admin_Controller { } } - ajax::response(implode("\n", $directories)); + ajax::response(json_encode($directories)); } private function _get_import_form() { diff --git a/modules/g2_import/views/admin_g2_import.html.php b/modules/g2_import/views/admin_g2_import.html.php index 09aa6fae..fd9487e4 100644 --- a/modules/g2_import/views/admin_g2_import.html.php +++ b/modules/g2_import/views/admin_g2_import.html.php @@ -5,10 +5,7 @@ $("document").ready(function() { $("form input[name=embed_path]").gallery_autocomplete( "<?= url::site("__ARGS__") ?>".replace("__ARGS__", "admin/g2_import/autocomplete"), - { - max: 256, - loadingClass: "g-loading-small", - }); + {}); }); </script> |