diff options
author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2006-04-18 08:47:08 +0000 |
---|---|---|
committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2006-04-18 08:47:08 +0000 |
commit | 4632a09466e986b311136fd0150bd4004b003c16 (patch) | |
tree | abcf4a6bd0f8763634b3924b4e538eccdad9731c /lib | |
parent | a8aff4f67f9cc15e93bcd46668ae8e698d778acf (diff) | |
download | ampache-4632a09466e986b311136fd0150bd4004b003c16.tar.gz ampache-4632a09466e986b311136fd0150bd4004b003c16.tar.bz2 ampache-4632a09466e986b311136fd0150bd4004b003c16.zip |
new install theme and fixed jpeg resize issues
Diffstat (limited to 'lib')
-rw-r--r-- | lib/class/song.class.php | 1 | ||||
-rw-r--r-- | lib/ui.lib.php | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/class/song.class.php b/lib/class/song.class.php index ddaa96e7..45b37f1e 100644 --- a/lib/class/song.class.php +++ b/lib/class/song.class.php @@ -152,6 +152,7 @@ class Song { break; case 'mpc': $this->mime = "audio/x-musepack"; + $this->type = "MPC"; break; default: $this->mime = "audio/mpeg"; diff --git a/lib/ui.lib.php b/lib/ui.lib.php index 2bed47c6..ec5a1b28 100644 --- a/lib/ui.lib.php +++ b/lib/ui.lib.php @@ -762,7 +762,7 @@ function img_resize($image,$size,$type){ /* First check for php-gd */ $info = gd_info(); - if ($type == 'jpg' AND !$info['JPG Support']) { + if ( ($type == 'jpg' OR $type == 'jpeg') AND !$info['JPG Support']) { return false; } elseif ($type == 'png' AND !$info['PNG Support']) { @@ -785,6 +785,7 @@ function img_resize($image,$size,$type){ // determine image type and send it to the client switch ($type) { case 'jpg': + case 'jpeg': imagejpeg($img,null,100); break; case 'gif': |