diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2011-01-20 23:42:36 -0800 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2011-01-20 23:42:36 -0800 |
| commit | 029fa606be07c6fab0c1de6326a26f0ee442523a (patch) | |
| tree | 0dc4957e1b44f2713f1ecaa6c8639e77f124c5a9 /modules | |
| parent | f25c1fab32d603ee0a835caabb6ccc52451f4891 (diff) | |
Fix a bug introduced in the refactor in
65448548637f462ad17c12b149cdb2a169d07026 for #1547. By skipping the
staging dirs, we wind up scanning the entire filesystem because the
first model is blank so there's no leading path before the /*.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/server_add/controllers/server_add.php | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/modules/server_add/controllers/server_add.php b/modules/server_add/controllers/server_add.php index 11d4cb0a..6639fbae 100644 --- a/modules/server_add/controllers/server_add.php +++ b/modules/server_add/controllers/server_add.php @@ -162,11 +162,6 @@ class Server_Add_Controller extends Admin_Controller { ->find(); if ($entry->loaded()) { - // Ignore the staging directories as directories to be imported. - if (!empty($paths[$entry->path])) { - $entry->delete(); - } - $child_paths = glob(preg_quote($entry->path) . "/*"); if (!$child_paths) { $child_paths = glob("{$entry->path}/*"); |