summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Arthur <paul.arthur@flowerysong.com>2012-09-06 12:51:46 -0400
committerPaul Arthur <paul.arthur@flowerysong.com>2012-09-06 12:56:20 -0400
commit25b77a6c756496e0508b92dc58ac015091d1bc41 (patch)
treeceb95abf5283eec361cc8b9ee908170dfa532b63
parentdabbea660ff0168acae65328c9f6d8edf6de4443 (diff)
downloadampache-25b77a6c756496e0508b92dc58ac015091d1bc41.tar.gz
ampache-25b77a6c756496e0508b92dc58ac015091d1bc41.tar.bz2
ampache-25b77a6c756496e0508b92dc58ac015091d1bc41.zip
Partial fix for ASF tags
Actually transfer all ASF tags into the asf tag array. I suspect that some things like 'genre' may actually be multivalued, but I don't have any samples to back that up.
-rwxr-xr-xdocs/CHANGELOG3
-rw-r--r--lib/class/vainfo.class.php4
2 files changed, 7 insertions, 0 deletions
diff --git a/docs/CHANGELOG b/docs/CHANGELOG
index 53143d94..3cf94fcc 100755
--- a/docs/CHANGELOG
+++ b/docs/CHANGELOG
@@ -3,6 +3,9 @@
--------------------------------------------------------------------------
--------------------------------------------------------------------------
+ v.3.6-future
+ - Fixed ASF tag parsing regression (reported by cygn)
+
v.3.6-Alpha2 2012-08-15
- Fixed CLI database load to work regardless of whether it's run from
the top-level directory (reported by porthose)
diff --git a/lib/class/vainfo.class.php b/lib/class/vainfo.class.php
index eba3565b..f52545b8 100644
--- a/lib/class/vainfo.class.php
+++ b/lib/class/vainfo.class.php
@@ -900,6 +900,10 @@ class vainfo {
break;
}
+ foreach($tags['tags']['asf'] as $tag => $data) {
+ $array[$tag] = $this->_clean_tag($data['0']);
+ }
+
return $array;
} // _parse_wmv