summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--upload.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/upload.php b/upload.php
index e5efad0f..0d483092 100644
--- a/upload.php
+++ b/upload.php
@@ -66,13 +66,17 @@ switch( $action ) {
}
} // if unwriteable
+ $catalog_id = find_upload_catalog(conf('quarantine_dir'));
+
/* Make sure that it's not in a catalog dir */
- if (find_upload_catalog(conf('quarantine_dir'))) {
+ if (!$catalog_id) {
$GLOBALS['error']->add_error('general',"Error: Quarantine Directory inside a catalog");
if (conf('debug')) {
log_event($user->username,' upload ',"Error: Quarantine Directory inside a catalog");
}
} // if in catalog dir
+
+ $catalog = new Catalog($catalog_id);
foreach ($_FILES as $key => $file) {