diff options
| author | Max Kremmel <xing@synapse.plus.com> | 2006-01-20 11:08:50 +0000 |
|---|---|---|
| committer | Max Kremmel <xing@synapse.plus.com> | 2006-01-20 11:08:50 +0000 |
| commit | c3465553f57cb5beea657ec1af5cc01921a87da5 (patch) | |
| tree | 36844ef05205e4f3f74e46166335633e749f904a /LibertySystem.php | |
| parent | a49cde791804010f66c64cf0d1e77f288963f4b0 (diff) | |
| download | liberty-c3465553f57cb5beea657ec1af5cc01921a87da5.tar.gz liberty-c3465553f57cb5beea657ec1af5cc01921a87da5.tar.bz2 liberty-c3465553f57cb5beea657ec1af5cc01921a87da5.zip | |
merge recent changes into HEAD
Diffstat (limited to 'LibertySystem.php')
| -rwxr-xr-x | LibertySystem.php | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/LibertySystem.php b/LibertySystem.php index 7199634..0b02a1f 100755 --- a/LibertySystem.php +++ b/LibertySystem.php @@ -3,7 +3,7 @@ * System class for handling the liberty package * * @package liberty -* @version $Header: /cvsroot/bitweaver/_bit_liberty/LibertySystem.php,v 1.10 2005/12/18 22:30:22 squareing Exp $ +* @version $Header: /cvsroot/bitweaver/_bit_liberty/LibertySystem.php,v 1.11 2006/01/20 11:08:50 squareing Exp $ * @author spider <spider@steelsun.com> */ @@ -215,7 +215,7 @@ class LibertySystem extends LibertyBase { } // Get the URL to the icon for the mime type passed in. This should probably check for files of multiple image types instead of just jpg - function getMimeThumbnailURL($pMimeType) { + function getMimeThumbnailURL($pMimeType, $pExt=NULL) { $ret = NULL; $parts = split('/',$pMimeType); if (count($parts) > 1) { @@ -231,8 +231,11 @@ class LibertySystem extends LibertyBase { 'url' => 'only', ); if( !$ret = smarty_function_biticon( $biticon,$gBitSmarty ) ) { - $biticon['iname'] = 'generic'; - $ret = smarty_function_biticon( $biticon,$gBitSmarty ); + $biticon['iname'] = $pExt; + if( !$ret = smarty_function_biticon( $biticon,$gBitSmarty ) ) { + $biticon['iname'] = 'generic'; + $ret = smarty_function_biticon( $biticon,$gBitSmarty ); + } } } return $ret; |