diff options
| author | Christian Fowler <spider@viovio.com> | 2006-12-21 09:44:37 +0000 |
|---|---|---|
| committer | Christian Fowler <spider@viovio.com> | 2006-12-21 09:44:37 +0000 |
| commit | 9023d6d1c4ec5a6eb133976822d9aa8361b15d67 (patch) | |
| tree | e2851c565eca2edb8bed53e57d2bcc1d10931c76 | |
| parent | f05c8791375cfc13b3a7908e5e742cad61bdd0bd (diff) | |
| download | liberty-9023d6d1c4ec5a6eb133976822d9aa8361b15d67.tar.gz liberty-9023d6d1c4ec5a6eb133976822d9aa8361b15d67.tar.bz2 liberty-9023d6d1c4ec5a6eb133976822d9aa8361b15d67.zip | |
check for empty thumbnail_sizes in magickwand_resize
| -rw-r--r-- | LibertyAttachable.php | 4 | ||||
| -rw-r--r-- | plugins/storage.bitfile.php | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/LibertyAttachable.php b/LibertyAttachable.php index 3016298..dece5cc 100644 --- a/LibertyAttachable.php +++ b/LibertyAttachable.php @@ -3,7 +3,7 @@ * Management of Liberty Content * * @package liberty - * @version $Header: /cvsroot/bitweaver/_bit_liberty/LibertyAttachable.php,v 1.47 2006/12/03 06:36:53 spiderr Exp $ + * @version $Header: /cvsroot/bitweaver/_bit_liberty/LibertyAttachable.php,v 1.48 2006/12/21 09:44:36 spiderr Exp $ * @author spider <spider@steelsun.com> */ // +----------------------------------------------------------------------+ @@ -967,7 +967,7 @@ function liberty_magickwand_resize_image( &$pFileHash, $pFormat = NULL ) { MagickProfileImage($magickWand, 'ICC', file_get_contents( UTIL_PKG_PATH.'icc/srgb.icm' ) ); MagickSetImageColorspace( $magickWand, MW_RGBColorspace ); - if( in_array( 'original', $pFileHash['thumbnail_sizes'] ) + if( !empty( $pFileHash['thumbnail_sizes'] ) && in_array( 'original', $pFileHash['thumbnail_sizes'] ) && $gBitSystem->isFeatureActive( 'liberty_jpeg_originals' ) && empty( $rgbConverts[$pFileHash['dest_path']] ) ) { diff --git a/plugins/storage.bitfile.php b/plugins/storage.bitfile.php index 25b56ce..6c9b419 100644 --- a/plugins/storage.bitfile.php +++ b/plugins/storage.bitfile.php @@ -1,6 +1,6 @@ <?php /** - * @version $Revision: 1.17 $ + * @version $Revision: 1.18 $ * @package liberty * @subpackage plugins_storage */ @@ -32,6 +32,9 @@ function bit_files_verify( &$pStoreRow ) { $pStoreRow['plugin_guid'] = PLUGIN_GUID_BIT_FILES; $pStoreRow['foreign_id'] = NULL; $pStoreRow['dest_base_name'] = substr( $pStoreRow['upload']['name'], 0, strrpos( $pStoreRow['upload']['name'], '.' ) ); + if( function_exists( 'transliterate' ) ) { +// $pStoreRow['dest_base_name'] = transliterate( $pStoreRow['dest_base_name'], array('han_transliterate', 'diacritical_remove'), 'utf-8', 'utf-8' ); + } $pStoreRow['source_file'] = $pStoreRow['upload']['tmp_name']; return( TRUE ); |