fix ampache htmlentity calls

This commit is contained in:
Robin Appelman 2011-11-24 02:53:35 +01:00
parent 2dd757156c
commit 6c01175acd
1 changed files with 6 additions and 6 deletions

View File

@ -128,7 +128,7 @@ class OC_MEDIA_AMPACHE{
$albums=count(OC_MEDIA_COLLECTION::getAlbums($artist['artist_id'])); $albums=count(OC_MEDIA_COLLECTION::getAlbums($artist['artist_id']));
$songs=count(OC_MEDIA_COLLECTION::getSongs($artist['artist_id'])); $songs=count(OC_MEDIA_COLLECTION::getSongs($artist['artist_id']));
$id=$artist['artist_id']; $id=$artist['artist_id'];
$name=htmlentities($artist['artist_name'], ENT_COMPAT | ENT_HTML401, 'UTF-8'); $name=htmlentities($artist['artist_name'], ENT_COMPAT, 'UTF-8');
echo("\t<artist id='$id'>\n"); echo("\t<artist id='$id'>\n");
echo("\t\t<name>$name</name>\n"); echo("\t\t<name>$name</name>\n");
echo("\t\t<albums>$albums</albums>\n"); echo("\t\t<albums>$albums</albums>\n");
@ -142,10 +142,10 @@ class OC_MEDIA_AMPACHE{
if(!$artistName){ if(!$artistName){
$artistName=OC_MEDIA_COLLECTION::getArtistName($album['album_artist']); $artistName=OC_MEDIA_COLLECTION::getArtistName($album['album_artist']);
} }
$artistName=htmlentities($artistName, ENT_COMPAT | ENT_HTML401, 'UTF-8'); $artistName=htmlentities($artistName, ENT_COMPAT, 'UTF-8');
$songs=count(OC_MEDIA_COLLECTION::getSongs($album['album_artist'],$album['album_id'])); $songs=count(OC_MEDIA_COLLECTION::getSongs($album['album_artist'],$album['album_id']));
$id=$album['album_id']; $id=$album['album_id'];
$name=htmlentities($album['album_name'], ENT_COMPAT | ENT_HTML401, 'UTF-8'); $name=htmlentities($album['album_name'], ENT_COMPAT, 'UTF-8');
$artist=$album['album_artist']; $artist=$album['album_artist'];
echo("\t<album id='$id'>\n"); echo("\t<album id='$id'>\n");
echo("\t\t<name>$name</name>\n"); echo("\t\t<name>$name</name>\n");
@ -163,10 +163,10 @@ class OC_MEDIA_AMPACHE{
if(!$albumName){ if(!$albumName){
$albumName=OC_MEDIA_COLLECTION::getAlbumName($song['song_album']); $albumName=OC_MEDIA_COLLECTION::getAlbumName($song['song_album']);
} }
$artistName=htmlentities($artistName, ENT_COMPAT | ENT_HTML401, 'UTF-8'); $artistName=htmlentities($artistName, ENT_COMPAT, 'UTF-8');
$albumName=htmlentities($albumName, ENT_COMPAT | ENT_HTML401, 'UTF-8'); $albumName=htmlentities($albumName, ENT_COMPAT, 'UTF-8');
$id=$song['song_id']; $id=$song['song_id'];
$name=htmlentities($song['song_name'], ENT_COMPAT | ENT_HTML401, 'UTF-8'); $name=htmlentities($song['song_name'], ENT_COMPAT, 'UTF-8');
$artist=$song['song_artist']; $artist=$song['song_artist'];
$album=$song['song_album']; $album=$song['song_album'];
echo("\t<song id='$id'>\n"); echo("\t<song id='$id'>\n");