summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2009-05-11 12:41:25 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2009-05-11 12:41:25 +0000
commit053a91397b58c063966a454a4728a0a7243bdd4c (patch)
treee8c421bd1f3d0b43c37f80069ce0eb8b9b91e5fe
parent34191945a49321badb7d4c15f2d804564d40055b (diff)
downloadampache-053a91397b58c063966a454a4728a0a7243bdd4c.tar.gz
ampache-053a91397b58c063966a454a4728a0a7243bdd4c.tar.bz2
ampache-053a91397b58c063966a454a4728a0a7243bdd4c.zip
fix typo on get_class() check causing it to not identify song objects correctly
-rw-r--r--lib/class/catalog.class.php3
-rw-r--r--modules/flash/xspf_jukebox.flabin0 -> 681984 bytes
-rw-r--r--play/index.php4
3 files changed, 3 insertions, 4 deletions
diff --git a/lib/class/catalog.class.php b/lib/class/catalog.class.php
index 7dee54f2..570b0d21 100644
--- a/lib/class/catalog.class.php
+++ b/lib/class/catalog.class.php
@@ -1975,13 +1975,12 @@ class Catalog extends database_object {
* $artist checks if there then return id else insert and return id
* If readonly is passed then don't create, return false on not found
*/
- public static function check_artist($artist,$readonly='') {
+ public static function check_artist($artist,$mbid='',$readonly='') {
/* Clean up the artist */
$artist = trim($artist);
$artist = Dba::escape($artist);
-
/* Ohh no the artist has lost it's mojo! */
if (!$artist) {
$artist = _('Unknown (Orphaned)');
diff --git a/modules/flash/xspf_jukebox.fla b/modules/flash/xspf_jukebox.fla
new file mode 100644
index 00000000..3e9fe873
--- /dev/null
+++ b/modules/flash/xspf_jukebox.fla
Binary files differ
diff --git a/play/index.php b/play/index.php
index b63ba7b6..4a3a5b8c 100644
--- a/play/index.php
+++ b/play/index.php
@@ -318,7 +318,7 @@ else {
} // else not downsampling
// Put this song in the now_playing table only if it's a song for now...
-if (get_class($media) == 'song') {
+if (get_class($media) == 'Song') {
Stream::insert_now_playing($media->id,$uid,$media->time,$sid,get_class($media));
}
@@ -373,7 +373,7 @@ if($bytes_streamed < $stream_size AND (connection_status() == 0)) {
}
// Make sure that a good chunk of the song has been played
-if ($bytes_streamed > $min_bytes_streamed AND get_class($media) == 'song') {
+if ($bytes_streamed > $min_bytes_streamed AND get_class($media) == 'Song') {
debug_event('Play','Registering stats for ' . $media->title,'5');
$user->update_stats($media->id);