diff options
Diffstat (limited to 'lib/class')
| -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; |