summaryrefslogtreecommitdiff
path: root/modules/server_add/controllers/server_add.php
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2011-01-09 18:38:09 -0800
committerBharat Mediratta <bharat@menalto.com>2011-01-09 18:38:09 -0800
commitb7ffb0501e09878b7d95f46a2b678678e0e60fa6 (patch)
tree4a9ecf35fd3cb24fe0f6615dbc13f5c18c5becb2 /modules/server_add/controllers/server_add.php
parentde5b06ae7442db2c7a8999c0c806997248ddb151 (diff)
Replace preg_quote with a more targeted regex to fix the problem where
directories get skipped. Fixes #1460, I think.
Diffstat (limited to 'modules/server_add/controllers/server_add.php')
-rw-r--r--modules/server_add/controllers/server_add.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/server_add/controllers/server_add.php b/modules/server_add/controllers/server_add.php
index e4c3e69c..757481d0 100644
--- a/modules/server_add/controllers/server_add.php
+++ b/modules/server_add/controllers/server_add.php
@@ -156,7 +156,7 @@ class Server_Add_Controller extends Admin_Controller {
$entry_id = null;
}
- $file = preg_quote($file);
+ $file = preg_replace("/(\*|\?|\[)/", "[$1]", $file);
foreach (glob("$file/*") as $child) {
if (is_dir($child)) {
$queue[] = array($child, $entry_id);