Merge branch 'master' into multi_app_dir

Conflicts:
	lib/app.php
	lib/base.php
	lib/minimizer/css.php
	lib/minimizer/js.php
	lib/template.php
	lib/util.php

4 files changed, 12 insertions, 9 deletions

diff --git a/apps/media/ajax/api.php b/apps/media/ajax/api.php
index a229c17e804..23abc579272 100644
--- a/apps/media/ajax/api.php
+++ b/apps/media/ajax/api.php
@@ -46,6 +46,9 @@ if(!isset($arguments['album'])){
 if(!isset($arguments['search'])){
 	$arguments['search']='';
 }
+
+session_write_close();
+
 OC_MEDIA_COLLECTION::$uid=OCP\USER::getUser();
 if($arguments['action']){
 	switch($arguments['action']){
diff --git a/apps/media/js/collection.js b/apps/media/js/collection.js
index 03d577c7c98..161fc0c6810 100644
--- a/apps/media/js/collection.js
+++ b/apps/media/js/collection.js
@@ -97,13 +97,13 @@ Collection={
 					if(artist.name && artist.songs.length>0){
 						var tr=template.clone().removeClass('template');
 						if(artist.songs.length>1){
-							tr.find('td.title a').text(artist.songs.length+' '+t('media','songs'));
-							tr.find('td.album a').text(artist.albums.length+' '+t('media','albums'));
+							tr.find('td.title a').html(artist.songs.length+' '+t('media','songs'));
+							tr.find('td.album a').html(artist.albums.length+' '+t('media','albums'));
 						}else{
-							tr.find('td.title a').text(artist.songs[0].name);
-							tr.find('td.album a').text(artist.albums[0].name);
+							tr.find('td.title a').html(artist.songs[0].name);
+							tr.find('td.album a').html(artist.albums[0].name);
 						}
-						tr.find('td.artist a').text(artist.name);
+						tr.find('td.artist a').html(artist.name);
 						tr.data('artistData',artist);
 						tr.find('td.artist a').click(function(event){
 							event.preventDefault();
diff --git a/apps/media/js/player.js b/apps/media/js/player.js
index ad406830833..867ea802363 100644
--- a/apps/media/js/player.js
+++ b/apps/media/js/player.js
@@ -40,7 +40,7 @@ var PlayList={
 					PlayList.init(items[index].type,null); // init calls load that calls play
 				}else{
 					PlayList.player.jPlayer("setMedia", items[PlayList.current]);
-					$(".jp-current-song").text(items[PlayList.current].name);
+					$(".jp-current-song").html(items[PlayList.current].name);
 					items[index].playcount++;
 					PlayList.player.jPlayer("play",time);
 					if(index>0){
diff --git a/apps/media/lib_scanner.php b/apps/media/lib_scanner.php
index 82170e5ca82..a8218c3a4d0 100644
--- a/apps/media/lib_scanner.php
+++ b/apps/media/lib_scanner.php
@@ -79,19 +79,19 @@ class OC_MEDIA_SCANNER{
 			OCP\Util::writeLog('media',"error reading artist tag in '$file'",OCP\Util::WARN);
 			$artist='unknown';
 		}else{
-			$artist=strip_tags(stripslashes($data['comments']['artist'][0]));
+			$artist=OCP\Util::sanitizeHTML(stripslashes($data['comments']['artist'][0]));
 		}
 		if(!isset($data['comments']['album'])){
 			OCP\Util::writeLog('media',"error reading album tag in '$file'",OCP\Util::WARN);
 			$album='unknown';
 		}else{
-			$album=strip_tags(stripslashes($data['comments']['album'][0]));
+			$album=OCP\Util::sanitizeHTML(stripslashes($data['comments']['album'][0]));
 		}
 		if(!isset($data['comments']['title'])){
 			OCP\Util::writeLog('media',"error reading title tag in '$file'",OCP\Util::WARN);
 			$title='unknown';
 		}else{
-			$title=strip_tags(stripslashes($data['comments']['title'][0]));
+			$title=OCP\Util::sanitizeHTML(stripslashes($data['comments']['title'][0]));
 		}
 		$size=$data['filesize'];
 		if (isset($data['comments']['track']))