Merge branch 'develop' of github.com:sebbacon/alaveteli into develop

Conflicts:
	Gemfile.lock
	script/handle-mail-replies
	script/handle-mail-replies.rb
	spec/controllers/request_controller_spec.rb

1 files changed, 4 insertions, 3 deletions

diff --git a/app/models/user.rb b/app/models/user.rb
index 57fce429c..a21676f68 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -409,7 +409,7 @@ class User < ActiveRecord::Base
         columns = self.class.content_columns.map{|c| c if %w(created_at updated_at admin_level email_confirmed).include?(c.name) }.compact
       end
       columns.each do |column|
-        yield(column.human_name, self.send(column.name), column.type.to_s)
+        yield(column.human_name, self.send(column.name), column.type.to_s, column.name)
       end
     end
 
@@ -438,8 +438,9 @@ class User < ActiveRecord::Base
 
     after_save(:purge_in_cache)
     def purge_in_cache
-        # XXX should only be if specific attributes have changed
-        self.info_requests.each {|x| x.purge_in_cache}
+        if self.name_changed?
+            self.info_requests.each {|x| x.purge_in_cache}
+        end
     end
 
 end