diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2005-08-12 15:10:09 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2005-08-12 15:10:09 +0000 |
| commit | b8d296afc476ac739b360a1c4f09bb548b0f46c1 (patch) | |
| tree | 38cf1ca82820430ab583f0a9bfb4d783d4bcda76 /upload.php | |
| parent | d96f9f276ea24bf46af7014ef88e22a209784699 (diff) | |
| download | ampache-b8d296afc476ac739b360a1c4f09bb548b0f46c1.tar.gz ampache-b8d296afc476ac739b360a1c4f09bb548b0f46c1.tar.bz2 ampache-b8d296afc476ac739b360a1c4f09bb548b0f46c1.zip | |
hopefully fixing the parse error
Diffstat (limited to 'upload.php')
| -rw-r--r-- | upload.php | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -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) { |