Merge remote-tracking branch 'origin/release/0.6.8' into wdtk

Conflicts:
  config/general.yml-example

1 files changed, 3 insertions, 2 deletions

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 810b3321e..4ee527bae 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -119,13 +119,13 @@ class UserController < ApplicationController
             @track_things = TrackThing.find(:all, :conditions => ["tracking_user_id = ? and track_medium = ?", @display_user.id, 'email_daily'], :order => 'created_at desc')
             for track_thing in @track_things
                 # XXX factor out of track_mailer.rb
-                xapian_object = InfoRequest.full_search([InfoRequestEvent], track_thing.track_query, 'described_at', true, nil, 20, 1) 
+                xapian_object = InfoRequest.full_search([InfoRequestEvent], track_thing.track_query, 'described_at', true, nil, 20, 1)
                 feed_results += xapian_object.results.map {|x| x[:model]}
             end
         end
 
         @feed_results = Array(feed_results).sort {|x,y| y.created_at <=> x.created_at}.first(20)
-        
+
         respond_to do |format|
             format.html { @has_json = true }
             format.json { render :json => @display_user.json_for_api }
@@ -244,6 +244,7 @@ class UserController < ApplicationController
         session[:user_circumstance] = nil
         session[:remember_me] = false
         session[:using_admin] = nil
+        session[:admin_name] = nil
     end
     def signout
         self._do_signout