diff options
| author | Christian Fowler <spider@viovio.com> | 2007-09-20 06:47:03 +0000 |
|---|---|---|
| committer | Christian Fowler <spider@viovio.com> | 2007-09-20 06:47:03 +0000 |
| commit | 4b88cd5a200f21138b67df4e319a0bec0d9eda91 (patch) | |
| tree | 3569e1252e4116066a71be61fbf16cb24676026f | |
| parent | dc220529bfeaca78d0379d5474554fafbac688d5 (diff) | |
| download | fisheye-4b88cd5a200f21138b67df4e319a0bec0d9eda91.tar.gz fisheye-4b88cd5a200f21138b67df4e319a0bec0d9eda91.tar.bz2 fisheye-4b88cd5a200f21138b67df4e319a0bec0d9eda91.zip | |
add _files_override to LIbertyAttachable::verify to control what gets sucked up as an upload. fixes archive extraction in fisheye, and other obscure reasons to manually stuff a file upload hash
| -rw-r--r-- | upload_inc.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/upload_inc.php b/upload_inc.php index 959f720..82262cb 100644 --- a/upload_inc.php +++ b/upload_inc.php @@ -1,6 +1,6 @@ <?php /** - * @version $Header: /cvsroot/bitweaver/_bit_fisheye/upload_inc.php,v 1.21 2007/07/12 08:18:15 squareing Exp $ + * @version $Header: /cvsroot/bitweaver/_bit_fisheye/upload_inc.php,v 1.22 2007/09/20 06:47:03 spiderr Exp $ * @package fisheye * @subpackage functions */ @@ -144,7 +144,8 @@ function fisheye_process_directory( $pDestinationDir, &$pParentGallery, $pRoot=F $errors = array_merge( $errors, fisheye_process_archive( $scanFile, $pParentGallery ) ); } elseif( preg_match( '/^video\/*/', $scanFile['type'] ) || preg_match( '/^image\/*/', $scanFile['type'] ) || preg_match( '/pdf/i', $scanFile['type'] ) || $gBitUser->hasPermission( 'p_fisheye_upload_nonimages' ) ) { $newImage = new FisheyeImage(); - $imageHash = array( 'upload' => $scanFile ); + unset( $_FILES ); + $imageHash = array( '_files_override' => array( $scanFile ) ); if( $newImage->store( $imageHash ) ) { if( $pRoot ) { $newImage->addToGalleries( $_REQUEST['galleryAdditions'] ); |