Merged r8761 from trunk

attachment: fix that diff type is not saved in user preference. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.3-stable@8763 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-04 08:26:28 +00:00
parent ce67da88c4
commit 9318cd2fbe
2 changed files with 20 additions and 0 deletions
@@ -29,6 +29,11 @@ class AttachmentsController < ApplicationController
          @diff = File.new(@attachment.diskfile, "rb").read
          @diff_type = params[:type] || User.current.pref[:diff_type] || 'inline'
          @diff_type = 'inline' unless %w(inline sbs).include?(@diff_type)
+          # Save diff type as user preference
+          if User.current.logged? && @diff_type != User.current.pref[:diff_type]
+            User.current.pref[:diff_type] = @diff_type
+            User.current.preference.save
+          end
          render :action => 'diff'
        elsif @attachment.is_text? && @attachment.filesize <= Setting.file_max_size_displayed.to_i.kilobyte
          @content = File.new(@attachment.diskfile, "rb").read