diff options
author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2006-01-13 22:38:09 +0000 |
---|---|---|
committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2006-01-13 22:38:09 +0000 |
commit | 134e6a164e8d9988f1573458aeb9046b192b0378 (patch) | |
tree | 2a377d1087f65491401e4d0418144bae123c9cad | |
parent | 5d6e06fa17d5e155a01e14a9e6ceb3abf3d1b69f (diff) | |
download | ampache-134e6a164e8d9988f1573458aeb9046b192b0378.tar.gz ampache-134e6a164e8d9988f1573458aeb9046b192b0378.tar.bz2 ampache-134e6a164e8d9988f1573458aeb9046b192b0378.zip |
fixed album art if php-gd in not installed
-rw-r--r-- | bin/sort_files.php.inc | 3 | ||||
-rwxr-xr-x | docs/CHANGELOG | 2 | ||||
-rw-r--r-- | lib/ui.lib.php | 4 |
3 files changed, 7 insertions, 2 deletions
diff --git a/bin/sort_files.php.inc b/bin/sort_files.php.inc index 8fd2b673..d0ccc31a 100644 --- a/bin/sort_files.php.inc +++ b/bin/sort_files.php.inc @@ -33,7 +33,7 @@ */ /* Don't do anything just tell me what you would do */ -$test_mode = true; +/* $test_mode = true; */ /* m(__)m */ $alphabet_prefix = true; @@ -104,6 +104,7 @@ function sort_find_filename($song,$rename_pattern) { /* Start replacing stuff */ $replace_array = array('%a','%A','%t','%T','%y','%g'); $content_array = array($artist,$album,$title,$track,$year,$genre); + $rename_pattern = str_replace($replace_array,$content_array,$rename_pattern); diff --git a/docs/CHANGELOG b/docs/CHANGELOG index fbf84993..f0230a68 100755 --- a/docs/CHANGELOG +++ b/docs/CHANGELOG @@ -4,6 +4,8 @@ -------------------------------------------------------------------------- v.3.3.2-Beta2 + - Fixed a problem with the Image Resize code which wasn't correctly + detecting the lack of GD causing no art to be displayed - Fixed Remember Me button (part of the vauth) - Added new Session Handling code called vauth (Vollmer's Auth) - Moved xml-rpc server file to /server/xmlrpc.server.php keeping diff --git a/lib/ui.lib.php b/lib/ui.lib.php index 2a779ffe..0d708a01 100644 --- a/lib/ui.lib.php +++ b/lib/ui.lib.php @@ -786,9 +786,11 @@ function img_resize($image,$size,$type){ return false; } + if (!function_exists('gd_info')) { return false; } + /* First check for php-gd */ $info = gd_info(); - + if ($type == 'jpg' AND !$info['JPG Support']) { return false; } |