diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2008-05-31 07:48:02 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2008-05-31 07:48:02 +0000 |
| commit | fcfa466f4a82791ec47fb707520f6c251812df3c (patch) | |
| tree | 5b639a1c73640ef69d4dd5dc59c51402d30b2b95 /lib | |
| parent | 5a923b14c919e4c0a8ae5577df93b860526aa052 (diff) | |
| download | ampache-fcfa466f4a82791ec47fb707520f6c251812df3c.tar.gz ampache-fcfa466f4a82791ec47fb707520f6c251812df3c.tar.bz2 ampache-fcfa466f4a82791ec47fb707520f6c251812df3c.zip | |
sync to trunk
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/class/stream.class.php | 2 | ||||
| -rw-r--r-- | lib/class/update.class.php | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lib/class/stream.class.php b/lib/class/stream.class.php index dece1a7b..b68aaef2 100644 --- a/lib/class/stream.class.php +++ b/lib/class/stream.class.php @@ -386,7 +386,7 @@ class Stream { $xml['track']['info'] = Config::get('web_path') . "/albums.php?action=show&album=" . $song->album; $xml['track']['image'] = Config::get('web_path') . "/image.php?id=" . $song->album . "&thumb=3&sid=" . session_id(); $xml['track']['album'] = $song->f_album_full; - $xml['track']['duration'] = $song->time; + $xml['track']['duration'] = $song->time * 1000; $result .= xml_from_array($xml,1,'xspf'); } // end foreach diff --git a/lib/class/update.class.php b/lib/class/update.class.php index da6b7da8..fc25cdd6 100644 --- a/lib/class/update.class.php +++ b/lib/class/update.class.php @@ -282,6 +282,10 @@ class Update { $version[] = array('version' => '350001','description'=>$update_string); + $update_string = '- Remove Genre Field from song table.<br />' . + '- Add user_catalog table for tracking user<-->catalog mappings.<br />' . + '- Alter user table to handle SHA2 passwords.<br />'; + return $version; |