diff options
| author | Nathan Kinkade <nath@nkinka.de> | 2012-06-18 16:17:55 +0000 |
|---|---|---|
| committer | Nathan Kinkade <nath@nkinka.de> | 2012-06-18 16:17:55 +0000 |
| commit | 527bc809aaa6d48e7c1a7be50de31a4c3adcee90 (patch) | |
| tree | fb7432e06af9191f2300af97685f235325d36f57 /modules/g2_import | |
| parent | b52e834bd0bab530e98537d52b31d4b37f199739 (diff) | |
| parent | c48df3b8199802a75f30f38c6f7b3440f9fde4ca (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 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/modules/g2_import/controllers/admin_g2_import.php b/modules/g2_import/controllers/admin_g2_import.php index 5edd2a1b..2e435321 100644 --- a/modules/g2_import/controllers/admin_g2_import.php +++ b/modules/g2_import/controllers/admin_g2_import.php @@ -104,6 +104,7 @@ class Admin_g2_import_Controller extends Admin_Controller { $path_prefix = Input::instance()->get("q"); foreach (glob("{$path_prefix}*") as $file) { if (is_dir($file) && !is_link($file)) { + $file = html::clean($file); $directories[] = $file; // If we find an embed.php, include it as well |