patched flaw in getid3() fixed a problem with vainfo and songs with no tags and fixed the xml_from_array() function

2 files changed, 7 insertions, 8 deletions

diff --git a/modules/id3/getid3/module.tag.id3v2.php b/modules/id3/getid3/module.tag.id3v2.php
index 16f517e8..c6e6bcb5 100644
--- a/modules/id3/getid3/module.tag.id3v2.php
+++ b/modules/id3/getid3/module.tag.id3v2.php
@@ -2932,9 +2932,9 @@ class getid3_id3v2
 			TBP	bpm

 			TBPM	bpm

 			TCM	composer

-			TCO	content_type

+			TCO	genre

 			TCOM	composer

-			TCON	content_type

+			TCON	genre

 			TCOP	copyright_message

 			TCR	copyright_message

 			TDA	date

diff --git a/modules/id3/vainfo.class.php b/modules/id3/vainfo.class.php
index 74d276d9..c6192ded 100755
--- a/modules/id3/vainfo.class.php
+++ b/modules/id3/vainfo.class.php
@@ -170,6 +170,9 @@ class vainfo {
 
 		$results = array();
 
+		/* Gather Tag information from the filenames */
+		$results['file']	= $this->_parse_filename($this->filename);
+
 		/* Return false if we don't have 
 		 * any tags to look at 
 		 */
@@ -206,9 +209,6 @@ class vainfo {
 
 		} // end foreach
 
-		/* Gather Tag information from the filenames */
-		$results['file']	= $this->_parse_filename($this->filename);
-
 		return $results;
 
 	} // _get_tags
@@ -358,9 +358,8 @@ class vainfo {
 				case 'track_number':
 					$array['track'] = $this->_clean_tag($data['0'],$this->_file_encoding);
 				break;	
-				case 'content_type':
-					$data['0'] = preg_replace("/^\(\d+\)/","",$data['0']);
-					$array['genre'] = $this->_clean_tag($data['0'],$this->_file_encoding);
+				//case 'content_type':
+				//	$array['genre'] = $this->_clean_tag($data['0'],$this->_file_encoding);
 				break;
 				case 'comments':
 					$array['comment'] = $this->_clean_tag($data['0'],$this->_file_encoding);