diff options
| author | momo-i <momo-i@ampache> | 2008-10-22 21:57:40 +0000 |
|---|---|---|
| committer | momo-i <momo-i@ampache> | 2008-10-22 21:57:40 +0000 |
| commit | 14019e88c5370df8251b8d9836ea5867b670af1c (patch) | |
| tree | 2697bfd7f9b75ece964d07372dbb95c10b18df13 | |
| parent | ef9ebefaddfb5a5b3b6cf39dfb585f0a7dc8fd05 (diff) | |
| download | ampache-14019e88c5370df8251b8d9836ea5867b670af1c.tar.gz ampache-14019e88c5370df8251b8d9836ea5867b670af1c.tar.bz2 ampache-14019e88c5370df8251b8d9836ea5867b670af1c.zip | |
Fixed Album Art (folder.jpg images) #318 (Thx imigueldiaz)
| -rw-r--r-- | lib/class/album.class.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/class/album.class.php b/lib/class/album.class.php index 76857dc4..6b49eabe 100644 --- a/lib/class/album.class.php +++ b/lib/class/album.class.php @@ -334,7 +334,8 @@ class Album extends database_object { // Add the results we got to the current set $total_results += count($data); - $results = array_merge($results,$data); + // HACK for PHP 5, $data must be cast as array $results = array_merge($results, (array)$data); + $results = array_merge($results,(array)$data); if ($total_results > $limit AND $limit > 0) { return $results; |