diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2009-03-07 19:44:00 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2009-03-07 19:44:00 +0000 |
| commit | 059f6d4d5cde3a66b3c1a998ce123e7eb88e7a98 (patch) | |
| tree | 0f5cd4d5d651b15225bccab6a607662f6be5a165 /lib/class | |
| parent | 6ff7d498cf43c7f9453bcef495ca137da298ccf0 (diff) | |
| download | ampache-059f6d4d5cde3a66b3c1a998ce123e7eb88e7a98.tar.gz ampache-059f6d4d5cde3a66b3c1a998ce123e7eb88e7a98.tar.bz2 ampache-059f6d4d5cde3a66b3c1a998ce123e7eb88e7a98.zip | |
fix download and batch download Addresses #408 and #407
Diffstat (limited to 'lib/class')
| -rw-r--r-- | lib/class/preference.class.php | 3 | ||||
| -rw-r--r-- | lib/class/stream.class.php | 3 | ||||
| -rw-r--r-- | lib/class/video.class.php | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/lib/class/preference.class.php b/lib/class/preference.class.php index 3bd87b0b..370655c1 100644 --- a/lib/class/preference.class.php +++ b/lib/class/preference.class.php @@ -394,14 +394,13 @@ class Preference { return true; } - $user_id = $GLOBALS['user']->id ? Dba::escape($GLOBALS['user']->id) : '-1'; /* Get Global Preferences */ $sql = "SELECT `preference`.`name`,`user_preference`.`value`,`syspref`.`value` AS `system_value` FROM `preference` " . "LEFT JOIN `user_preference` `syspref` ON `syspref`.`preference`=`preference`.`id` AND `syspref`.`user`='-1' AND `preference`.`catagory`='system' " . "LEFT JOIN `user_preference` ON `user_preference`.`preference`=`preference`.`id` AND `user_preference`.`user`='$user_id' AND `preference`.`catagory`!='system'"; - $db_results = Dba::query($sql); + $db_results = Dba::read($sql); while ($row = Dba::fetch_assoc($db_results)) { $value = $row['system_value'] ? $row['system_value'] : $row['value']; diff --git a/lib/class/stream.class.php b/lib/class/stream.class.php index b8242832..0c16dd4e 100644 --- a/lib/class/stream.class.php +++ b/lib/class/stream.class.php @@ -547,8 +547,7 @@ class Stream { // Build up our object $song_id = $this->media['0']; - $song = new Song($song_id); - $url = $song->get_url(); + $url = Song::play_url($song_id); // Append the fact we are downloading $url .= '&action=download'; diff --git a/lib/class/video.class.php b/lib/class/video.class.php index 12894b4b..81e6ba7b 100644 --- a/lib/class/video.class.php +++ b/lib/class/video.class.php @@ -23,6 +23,7 @@ class Video extends database_object implements media { public $id; public $title; + public $enabled; public $file; /** |