diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/album.lib.php | 14 | ||||
| -rw-r--r-- | lib/class/localplay.abstract.php | 1 | ||||
| -rw-r--r-- | lib/class/localplay.class.php | 2 | ||||
| -rw-r--r-- | lib/class/update.class.php | 17 | ||||
| -rw-r--r-- | lib/log.lib.php | 2 |
5 files changed, 28 insertions, 8 deletions
diff --git a/lib/album.lib.php b/lib/album.lib.php index 4317c799..30e55c7f 100644 --- a/lib/album.lib.php +++ b/lib/album.lib.php @@ -130,22 +130,24 @@ function get_random_albums($count=6) { $sql .= ' FROM `album`'; $db_results = Dba::query($sql); - $sql = ''; + $in_sql = '`album_id` IN ('; $row = Dba::fetch_row($db_results); for ($i = 0; $i < ceil($count * 1.5); $i++) { - if ($i > 0) $sql .= ' UNION '; - $sql .= "SELECT `id` FROM (SELECT `id` FROM `album` LIMIT $row[$i],1) t".$i ; + $in_sql .= "'$row[$i]',"; } - - $db_results = Dba::query($sql); + + $in_sql = rtrim($in_sql,',') . ')'; + $sql = "SELECT `album_id` FROM `album_data` WHERE $in_sql AND `art` IS NOT NULL"; + + $db_results = Dba::query($sql); $results = array(); for ($i = 0; $i < $count; $i++) { $row = Dba::fetch_assoc($db_results); - $results[] = $row['id']; + $results[] = $row['album_id']; } return $results; diff --git a/lib/class/localplay.abstract.php b/lib/class/localplay.abstract.php index 36901a67..9eebdbe2 100644 --- a/lib/class/localplay.abstract.php +++ b/lib/class/localplay.abstract.php @@ -41,6 +41,7 @@ abstract class localplay_controller { // For display we need the following 'instance' functions abstract public function add_instance($data); abstract public function delete_instance($id); + abstract public function update_instance($id,$post); abstract public function get_instances(); abstract public function instance_fields(); abstract public function set_active_instance($uid); diff --git a/lib/class/localplay.class.php b/lib/class/localplay.class.php index 43d4bca1..1a4c8bef 100644 --- a/lib/class/localplay.class.php +++ b/lib/class/localplay.class.php @@ -545,7 +545,7 @@ class Localplay { */ public function update_instance($uid,$data) { - $data = $this->_player->update_instance($uid); + $data = $this->_player->update_instance($uid,$data); return $data; diff --git a/lib/class/update.class.php b/lib/class/update.class.php index 9a6be243..75bc8fc3 100644 --- a/lib/class/update.class.php +++ b/lib/class/update.class.php @@ -1108,5 +1108,22 @@ class Update { } // update_340014 + /** + * update_340015 + * This update tweaks the playlist table responding to complaints from usres + * who say it doesn't work, unreproduceable. This also adds an index to the + * album art table to try to make the random album art faster + */ + public static function update_340015() { + + $sql = "ALTER TABLE `album_data` ADD INDEX `album_art` `album_id`,`art`(5)"; + $db_results = Dba::query($sql); + + $sql = "ALTER TABLE `playlist` CHANGE `date` `date` INT ( 11 ) UNSIGNED"; + $db_results = Dba::query($sql); + + + } // update_340015 + } // end update class ?> diff --git a/lib/log.lib.php b/lib/log.lib.php index e7e9510a..a1798e3a 100644 --- a/lib/log.lib.php +++ b/lib/log.lib.php @@ -90,7 +90,7 @@ function ampache_error_handler($errno, $errstr, $errfile, $errline) { } if (strstr($errstr,"date.timezone")) { - $errstr = "You have not set a timezone (date.timezone) in your php.ini file. Please set it."; + $errstr = "You have not set a timezone (date.timezone) in your php.ini file. Please set it. This error is non-critical, and not caused by Ampache."; } /* The XML-RPC lib is broken, well kind of |