0
@@ -13,8 +13,8 @@
0
   
0
   def deliver_results
0
     if present?(params[:query])
0
-      @query = session[:last_search] = CGI.escape(params[:query])
0
-      @users = User.paginate(:all, :conditions => User.conditions_by_like(@query,['users.display_name','users.login','users.bio']), :include => :pic, :per_page => 15, :page => params[:page])
0
+      @query = session[:last_search] = params[:query]
0
+      @users = User.paginate(:all, :conditions => User.conditions_by_like(@query,['users.display_name','users.login','users.bio','users.city','users.country']), :include => :pic, :per_page => 15, :page => params[:page])
0
       @assets = Asset.paginate(:all, :conditions => Asset.conditions_by_like(@query,['assets.title', 'assets.description', 'assets.filename']), :include => [:user => :pic], :per_page => 15, :page => params[:page])
0
       @page_title = "Artists and Songs that match '#{(@query)}'"
0
     else