summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2008-03-11 06:14:09 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2008-03-11 06:14:09 +0000
commit7c8a11684d9de33fa0b7ed54fd59fd7cf2745911 (patch)
tree9412875fd882e80918a747c0ae848a0bfa24e03e
parent13bc70042d3077a9da5cb632b3a748f6d49314d8 (diff)
downloadampache-7c8a11684d9de33fa0b7ed54fd59fd7cf2745911.tar.gz
ampache-7c8a11684d9de33fa0b7ed54fd59fd7cf2745911.tar.bz2
ampache-7c8a11684d9de33fa0b7ed54fd59fd7cf2745911.zip
fixed issue with encoding on id3v1/2
-rwxr-xr-xdocs/CHANGELOG1
-rw-r--r--lib/class/vainfo.class.php14
2 files changed, 9 insertions, 6 deletions
diff --git a/docs/CHANGELOG b/docs/CHANGELOG
index d90fa2b8..a4f04fe2 100755
--- a/docs/CHANGELOG
+++ b/docs/CHANGELOG
@@ -4,6 +4,7 @@
--------------------------------------------------------------------------
v.3.4-Beta2
+ - Fixed issue with encoding of id3v1/v2 tags
- Fixed an issue with the clean function for playlists
- DB Update, fixes the playlist create issue with full strict on
MySQL 5.x
diff --git a/lib/class/vainfo.class.php b/lib/class/vainfo.class.php
index a68f90fe..2f8c7ba2 100644
--- a/lib/class/vainfo.class.php
+++ b/lib/class/vainfo.class.php
@@ -63,12 +63,14 @@ class vainfo {
// Initialize getID3 engine
$this->_getID3 = new getID3();
- $this->_getID3->option_md5_data = false;
- $this->_getID3->option_md5_data_source = false;
- $this->_getID3->option_tags_html = false;
- $this->_getID3->option_extra_info = false;
- $this->_getID3->option_tag_lyrics3 = false;
- $this->_getID3->encoding = $this->encoding;
+ $this->_getID3->option_md5_data = false;
+ $this->_getID3->option_md5_data_source = false;
+ $this->_getID3->option_tags_html = false;
+ $this->_getID3->option_extra_info = false;
+ $this->_getID3->option_tag_lyrics3 = false;
+ $this->_getID3->encoding = $this->encoding;
+ $this->_getID3->encoding_id3v1 = $this->encoding;
+ $this->_getID3->encoding_id3v2 = $this->encoding;
/* Check for ICONV */
if (function_exists('iconv')) {