From f4338f631b40868fbcec99c35a6f1b405d15d866 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Thu, 12 Jan 2012 00:54:29 +0100
Subject: [PATCH] fix searching music

---
 apps/media/lib_collection.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/apps/media/lib_collection.php b/apps/media/lib_collection.php
index 1240f1de2f..ed8aebb632 100644
--- a/apps/media/lib_collection.php
+++ b/apps/media/lib_collection.php
@@ -159,20 +159,21 @@ class OC_MEDIA_COLLECTION{
 	* @return array the list of albums found
 	*/
 	static public function getAlbums($artist=0,$search='%',$exact=false){
-		$cmd="SELECT DISTINCT *PREFIX*media_albums.album_name AS album_name , *PREFIX*media_albums.album_artist AS album_artist , *PREFIX*media_albums.album_id AS album_id
-			FROM *PREFIX*media_albums INNER JOIN *PREFIX*media_songs ON *PREFIX*media_albums.album_id=*PREFIX*media_songs.song_album WHERE *PREFIX*media_songs.song_user=? ORDER BY album_name";
+		$cmd="SELECT DISTINCT album_name, album_artist, album_id
+			FROM *PREFIX*media_albums INNER JOIN *PREFIX*media_songs ON album_id=song_album WHERE song_user=? ";
 		$params=array(self::$uid);
 		if($artist!=0){
-			$cmd.="AND *PREFIX*media_albums.album_artist = ? ";
+			$cmd.="AND album_artist = ? ";
 			array_push($params,$artist);
 		}
 		if($search!='%'){
-			$cmd.="AND *PREFIX*media_albums.album_name LIKE ? ";
+			$cmd.="AND album_name LIKE ? ";
 			if(!$exact){
 				$search="%$search%";
 			}
 			array_push($params,$search);
 		}
+		$cmd.=' ORDER BY album_name';
 		$query=OC_DB::prepare($cmd);
 		return $query->execute($params)->fetchAll();
 	}