From 029fa606be07c6fab0c1de6326a26f0ee442523a Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Thu, 20 Jan 2011 23:42:36 -0800 Subject: 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 /*. --- modules/server_add/controllers/server_add.php | 5 ----- 1 file changed, 5 deletions(-) (limited to 'modules/server_add') 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}/*"); -- cgit v1.2.3