From 05e6d947be96664074d95f9d6f4635415186ecac Mon Sep 17 00:00:00 2001
From: Karl 'vollmerk' Vollmer <vollmer@ampache.org>
Date: Sun, 2 Apr 2006 08:14:21 +0000
Subject: fixed a problem I introduced by unfudging the song.php file

---
 lib/class/song.class.php | 2 +-
 lib/general.js           | 2 +-
 lib/general.lib.php      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib')

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&amp;song=" . $this->id . "\">$this->f_title</a>";
+		$this->f_link = "<a href=\"" . conf('web_path') . "/song.php?action=single_song&amp;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&amp;song=' +
+	    '<a href="song.php?action=single_song&amp;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&amp;song=$song->id\" title=\"". htmlspecialchars($text) ."\">" .
+                        $items[] = "<li> <a href=\"$web_path/song.php?action=single_song&amp;song_id=$song->id\" title=\"". htmlspecialchars($text) ."\">" .
 	                                   htmlspecialchars(truncate_with_ellipse($text, conf('ellipse_threshold_title')+3)) . "&nbsp;($r->count)</a> </li>";
                 } // if it's a song
                 
-- 
cgit