fixed display issue when deleting track from a playlist, and fixed ordering of add to playlist stuff on the rightbar

3 files changed, 7 insertions, 2 deletions

diff --git a/docs/CHANGELOG b/docs/CHANGELOG
index a6891cd9..a9983eda 100755
--- a/docs/CHANGELOG
+++ b/docs/CHANGELOG
@@ -4,6 +4,8 @@
 
 --------------------------------------------------------------------------
   v.3.4-Alpha4 
+	- Fixed display issue with playlists when deleting a song
+	- Fixed sorting of 'add to Playlist' menu on rightbar
 	- Added another layer of checking on catalog deletes to help 
 		prevent orphaned elements
 	- Fixed lack of prefix on Albums, improves album art search 
diff --git a/lib/class/playlist.class.php b/lib/class/playlist.class.php
index eb74b163..4018dd43 100644
--- a/lib/class/playlist.class.php
+++ b/lib/class/playlist.class.php
@@ -243,7 +243,7 @@ class Playlist {
 		$user_id = Dba::escape($user_id); 
 		$results = array(); 
 
-		$sql = "SELECT `id` FROM `playlist` WHERE `user`='$user_id'"; 
+		$sql = "SELECT `id` FROM `playlist` WHERE `user`='$user_id' ORDER BY `name`"; 
 		$db_results = Dba::query($sql); 
 
 		while ($row = Dba::fetch_assoc($db_results)) { 
diff --git a/server/playlist.ajax.php b/server/playlist.ajax.php
index ac804f57..f5904bd6 100644
--- a/server/playlist.ajax.php
+++ b/server/playlist.ajax.php
@@ -35,7 +35,10 @@ switch ($_REQUEST['action']) {
 
 		$object_ids = $playlist->get_items(); 
 		ob_start(); 
-		require_once Config::get('prefix') . '/templates/show_playlist_songs.inc.php'; 	
+	        Browse::set_type('playlist_song');
+	        Browse::add_supplemental_object('playlist',$playlist->id);
+	        Browse::save_objects($object_ids);
+	        Browse::show_objects($object_ids);
 		$results['browse_content'] = ob_get_contents(); 
 		ob_end_clean(); 
 	break;