0
@@ -6,8 +6,8 @@ class PlaylistsController < ApplicationController
0
 
0
   before_filter :find_tracks, :only => [:show, :edit]
0
   
0
-  #rescue_from ActiveRecord::RecordNotFound, :with => :not_found
0
-  #rescue_from NoMethodError, :with => :user_not_found
0
+  rescue_from ActiveRecord::RecordNotFound, :with => :not_found
0
+  rescue_from NoMethodError, :with => :user_not_found
0
   
0
   # GET /playlists
0
   # GET /playlists.xml
0
@@ -33,13 +33,13 @@ class PlaylistsController < ApplicationController
0
 
0
   def sort
0
     respond_to do |format| 
0
+      format.html { @playlists = @user.playlists.include_private.find(:all) }
0
       format.js do
0
         params["playlist"].each_with_index do |id, position|
0
           Playlist.update(id, :position => position)
0
         end
0
         render :nothing => true
0
       end
0
-      format.html { @playlists = @user.playlists.include_private.find(:all) }
0
     end
0
   end
0
   

0
@@ -18,8 +18,7 @@ class UsersController < ApplicationController
0
         @user_count = User.count
0
         @active     = User.count(:all, :conditions => "assets_count > 0", :include => :pic)
0
       end
0
-      format.fbml do
0
-      end
0
+      format.fbml
0
       format.xml do
0
         @users = User.search(params[:q], :limit => 25)
0
         render :xml => @users.to_xml
0
@@ -44,12 +43,13 @@ class UsersController < ApplicationController
0
         @track_plays = @user.track_plays.from_user.find(:all, :limit =>10) 
0
         @favorites = Track.favorites.find_all_by_user_id(@user.id, :limit => 5)
0
         @comments = @user.comments.find_all_by_spam(false, :limit => 10)
0
+        render
0
       end
0
+      format.xml { @assets = @user.assets.find(:all, :order => 'created_at DESC')}
0
+      format.rss { @assets = @user.assets.find(:all, :order => 'created_at DESC')}
0
       format.fbml do
0
         @assets = @user.assets.find(:all)
0
       end
0
-      format.xml { @assets = @user.assets.find(:all, :order => 'created_at DESC')}
0
-      format.rss { @assets = @user.assets.find(:all, :order => 'created_at DESC')}
0
       format.js do  render :update do |page| 
0
           page.replace 'user_latest', :partial => "latest"
0
         end

0
@@ -1 +1 @@
0
-Subproject commit 8af98c3f8143d7086e15d4938fd56512ed584f2e
0
+Subproject commit d2212c1601dcd67e72e9d52f98347d3285fd7134