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

2015-07-21 15:40:48 +08:00 · 2015-07-21 15:40:48 +08:00 · d0e564a589
parent cfbd50e474 ec877c9044
commit d0e564a589
1 changed files with 1 additions and 1 deletions
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@ -514,7 +514,7 @@ private
  end

  def has_login
-    unless @attachment.container_type == "PhoneAppVersion"
+    unless @attachment && @attachment.container_type == "PhoneAppVersion"
      render_403 unless User.current.logged?
    end
  end