diff options
| -rw-r--r-- | lib/class/artist.class.php | 5 | ||||
| -rw-r--r-- | lib/class/vainfo.class.php | 4 | ||||
| -rw-r--r-- | song.php | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/lib/class/artist.class.php b/lib/class/artist.class.php index 1f7848c5..ce7fe2f1 100644 --- a/lib/class/artist.class.php +++ b/lib/class/artist.class.php @@ -306,7 +306,7 @@ class Artist extends database_object { if (strlen($results['lyrics']) > 1) { debug_event("lyrics", "Use DB", "5"); - return html_entity_decode(strip_tags(($results['lyrics'])), ENT_QUOTES); + return html_entity_decode($results['lyrics'], ENT_QUOTES); } elseif (strlen($lyrics) > 1) { // encode lyrics utf8 if (function_exists('mb_detect_encoding') AND function_exists('mb_convert_encoding')) { @@ -315,8 +315,9 @@ class Artist extends database_object { $lyrics = mb_convert_encoding($lyrics, "UTF-8", $enc); } } - $sql = "UPDATE `song_data` SET `lyrics` = '" . htmlspecialchars(strip_tags($lyrics), ENT_QUOTES) . "' WHERE `song_id`='" . Dba::escape($song_id) . "'"; + $sql = "UPDATE `song_data` SET `lyrics` = '" . htmlspecialchars($lyrics, ENT_QUOTES) . "' WHERE `song_id`='" . Dba::escape($song_id) . "'"; $db_results = Dba::write($sql); + debug_event("lyrics", "Use id3v2 tag (USLT or lyrics3)", "5"); return $lyrics; } diff --git a/lib/class/vainfo.class.php b/lib/class/vainfo.class.php index 0d7fbe92..6018213c 100644 --- a/lib/class/vainfo.class.php +++ b/lib/class/vainfo.class.php @@ -268,10 +268,10 @@ class vainfo { $info['language'] = Dba::escape($results[$key]['language']); /* @TODO returned lyrics are raw data. An appropriate escape is necessary for this. @momo-i */ if (!empty($results[$key]['unsynchronised lyric'])) { // ID3v2 USLT - $info['lyrics'] = $results[$key]['unsynchronised lyric']; + $info['lyrics'] = str_replace(array("\r\n","\r","\n"), '<br />',strip_tags($results[$key]['unsynchronised lyric'])); } else { // Lyrics3 v2.0 - $info['lyrics'] = $results['info']['lyrics']['unsynchedlyrics']; + $info['lyrics'] = str_replace(array("\r\n","\r","\n"), '<br />',strip_tags($results['info']['lyrics']['unsynchedlyrics']); } $info['track'] = intval($results[$key]['track']); } @@ -35,7 +35,7 @@ switch ($_REQUEST['action']) { $show_lyrics = Config::get('show_lyrics'); if($show_lyrics == 1) { $lyric = new Artist(); - $return = scrub_out($lyric->get_song_lyrics($song->id, ucwords($song->f_artist), ucwords($song->title))); + $return = $lyric->get_song_lyrics($song->id, ucwords($song->f_artist), ucwords($song->title)); $link = '<a href="http://lyricwiki.org/' . rawurlencode(ucwords($song->f_artist)) . ':' . rawurlencode(ucwords($song->title)) . '" target="_blank">'; $link .= sprintf(_('%1$s - %2$s Lyrics Detail'), ucwords($song->f_artist), ucwords($song->title)); $link .= "</a><br /><br />"; |