summaryrefslogtreecommitdiffstats
path: root/lib/stream.lib.php
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2008-12-07 14:02:12 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2008-12-07 14:02:12 +0000
commit07f8ef395a4d4c6312ded96a039ef58e245e70b0 (patch)
treeae4832d14873950cfb864e5f4a73f5e7814bff14 /lib/stream.lib.php
parent287a46f11e429ff8a11bc646afaeadce122425c6 (diff)
downloadampache-07f8ef395a4d4c6312ded96a039ef58e245e70b0.tar.gz
ampache-07f8ef395a4d4c6312ded96a039ef58e245e70b0.tar.bz2
ampache-07f8ef395a4d4c6312ded96a039ef58e245e70b0.zip
finished up the rss feed stuff for now playing, it is currently the only type that works, should conform to rss standards now
Diffstat (limited to 'lib/stream.lib.php')
-rw-r--r--lib/stream.lib.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/stream.lib.php b/lib/stream.lib.php
index b0f4d609..8cc92d50 100644
--- a/lib/stream.lib.php
+++ b/lib/stream.lib.php
@@ -41,7 +41,8 @@ function show_now_playing() {
*/
function get_now_playing($filter='') {
- $sql = "SELECT `session_stream`.`agent`,`now_playing`.`song_id`,`now_playing`.`user` FROM `now_playing` " .
+ $sql = "SELECT `session_stream`.`agent`,`now_playing`.`song_id`,`now_playing`.`user`,`now_playing`.`expire` " .
+ "FROM `now_playing` " .
"LEFT JOIN `session_stream` ON `session_stream`.`id`=`now_playing`.`id` " .
"ORDER BY `now_playing`.`expire` DESC";
$db_results = Dba::query($sql);