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

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