diff options
| author | Nathan Kinkade <nath@nkinka.de> | 2012-06-01 15:10:46 +0000 |
|---|---|---|
| committer | Nathan Kinkade <nath@nkinka.de> | 2012-06-01 15:10:46 +0000 |
| commit | b52e834bd0bab530e98537d52b31d4b37f199739 (patch) | |
| tree | ff31dd4f6c2afaeae380f10dc691cde3cb4e6739 /modules/g2_import | |
| parent | f5098f54b8279f468d94747b1156e15ea05d6d25 (diff) | |
| parent | 4c98b218316df00c8bf3eeb28a8324ec64348bff (diff) | |
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'modules/g2_import')
| -rw-r--r-- | modules/g2_import/controllers/admin_g2_import.php | 2 | ||||
| -rw-r--r-- | modules/g2_import/views/admin_g2_import.html.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/g2_import/controllers/admin_g2_import.php b/modules/g2_import/controllers/admin_g2_import.php index b07082c9..5edd2a1b 100644 --- a/modules/g2_import/controllers/admin_g2_import.php +++ b/modules/g2_import/controllers/admin_g2_import.php @@ -113,7 +113,7 @@ class Admin_g2_import_Controller extends Admin_Controller { } } - print implode("\n", $directories); + ajax::response(implode("\n", $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 9c4eb840..22e19f5b 100644 --- a/modules/g2_import/views/admin_g2_import.html.php +++ b/modules/g2_import/views/admin_g2_import.html.php @@ -3,7 +3,7 @@ <?= $theme->script("jquery.autocomplete.js") ?> <script type="text/javascript"> $("document").ready(function() { - $("form input[name=embed_path]").autocomplete( + $("form input[name=embed_path]").gallery_autocomplete( "<?= url::site("__ARGS__") ?>".replace("__ARGS__", "admin/g2_import/autocomplete"), { max: 256, |