diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2006-04-02 08:14:21 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2006-04-02 08:14:21 +0000 |
| commit | 05e6d947be96664074d95f9d6f4635415186ecac (patch) | |
| tree | 6df88ea49db571474efa88af09fe21e088b59f5a /lib | |
| parent | 864a32a3287df06f4b1e4fb5a422b699562ab4e9 (diff) | |
| download | ampache-05e6d947be96664074d95f9d6f4635415186ecac.tar.gz ampache-05e6d947be96664074d95f9d6f4635415186ecac.tar.bz2 ampache-05e6d947be96664074d95f9d6f4635415186ecac.zip | |
fixed a problem I introduced by unfudging the song.php file
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/class/song.class.php | 2 | ||||
| -rw-r--r-- | lib/general.js | 2 | ||||
| -rw-r--r-- | lib/general.lib.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/class/song.class.php b/lib/class/song.class.php index ff47fee8..d0868de2 100644 --- a/lib/class/song.class.php +++ b/lib/class/song.class.php @@ -601,7 +601,7 @@ class Song { $this->f_title = truncate_with_ellipse($this->title,conf('ellipse_threshold_title')); // Create A link inclduing the title - $this->f_link = "<a href=\"" . conf('web_path') . "/song.php?action=m3u&song=" . $this->id . "\">$this->f_title</a>"; + $this->f_link = "<a href=\"" . conf('web_path') . "/song.php?action=single_song&song_id=" . $this->id . "\">$this->f_title</a>"; // Format the Bitrate $this->f_bitrate = intval($this->bitrate/1000) . "-" . strtoupper($this->mode); diff --git a/lib/general.js b/lib/general.js index 9eebe02b..ffc84683 100644 --- a/lib/general.js +++ b/lib/general.js @@ -133,7 +133,7 @@ function show_now_playing_display (el) { // output the song name and link tag document.getElementById('np_song_'+i).innerHTML = - '<a href="song.php?action=m3u&song=' + + '<a href="song.php?action=single_song&song_id=' + now_playing.getElementsByTagName('songid')[0].firstChild.data + '">' + now_playing.getElementsByTagName('songtitle')[0].firstChild.data + '</a>'; diff --git a/lib/general.lib.php b/lib/general.lib.php index ad4d7519..82b0c38f 100644 --- a/lib/general.lib.php +++ b/lib/general.lib.php @@ -625,7 +625,7 @@ function get_global_popular($type) { $artist = $song->get_artist_name(); $text = "$artist - $song->title"; /* Add to array */ - $items[] = "<li> <a href=\"$web_path/song.php?action=m3u&song=$song->id\" title=\"". htmlspecialchars($text) ."\">" . + $items[] = "<li> <a href=\"$web_path/song.php?action=single_song&song_id=$song->id\" title=\"". htmlspecialchars($text) ."\">" . htmlspecialchars(truncate_with_ellipse($text, conf('ellipse_threshold_title')+3)) . " ($r->count)</a> </li>"; } // if it's a song |