Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

2014-10-24 09:48:07 +08:00 · 2014-10-24 09:48:07 +08:00 · b732944a2a
parent 1f9c6b66ca 9723d62d16
commit b732944a2a
1 changed files with 2 additions and 0 deletions
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@ -56,6 +56,8 @@ class AttachmentsController < ApplicationController
      }
      format.api
    end
+  rescue  Encoding::InvalidByteSequenceError => e
+    render :action => 'file'
  end

  def download