summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2007-08-02 05:20:26 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2007-08-02 05:20:26 +0000
commitcf2e2488779f60251d66f375273d9b2583528f64 (patch)
treeaeea65e98b0d7df40a2ed294a53dd254b2e61dd2 /lib
parentf13037cc5466cf09bf1535acfea8809137927591 (diff)
downloadampache-cf2e2488779f60251d66f375273d9b2583528f64.tar.gz
ampache-cf2e2488779f60251d66f375273d9b2583528f64.tar.bz2
ampache-cf2e2488779f60251d66f375273d9b2583528f64.zip
moved search to upper right, removed the playlists from the left menubar, fixed a potential uncaught exception on id3 tags
Diffstat (limited to 'lib')
-rw-r--r--lib/class/album.class.php5
-rwxr-xr-xlib/class/vainfo.class.php2
2 files changed, 5 insertions, 2 deletions
diff --git a/lib/class/album.class.php b/lib/class/album.class.php
index 02da0a10..b72633e3 100644
--- a/lib/class/album.class.php
+++ b/lib/class/album.class.php
@@ -326,7 +326,10 @@ class Album {
$song = new Song($song_id);
// If we find a good one, stop looking
$getID3 = new getID3();
- $id3 = $getID3->analyze($song->file);
+ try { $id3 = $getID3->analyze($song->file); }
+ catch (Exception $error) {
+ debug_event('getid3',$error->message,'1');
+ }
if ($id3['format_name'] == "WMA") {
$image = $id3['asf']['extended_content_description_object']['content_descriptors']['13'];
diff --git a/lib/class/vainfo.class.php b/lib/class/vainfo.class.php
index c7197054..7e3904c0 100755
--- a/lib/class/vainfo.class.php
+++ b/lib/class/vainfo.class.php
@@ -98,7 +98,7 @@ class vainfo {
/* Figure out what type of file we are dealing with */
$this->type = $this->_get_type();
- /* This is very important, figure out th encoding of the
+ /* This is very important, figure out the encoding of the
* file
*/
$this->_set_encoding();