Merge branch 'hjq_beidou' into develop

app/controllers/attachments_controller.rb

@@ -660,10 +660,8 @@ private
   end
 
   def has_login
-    unless@attachment.container_type == "Organization"
     unless @attachment && @attachment.container_type == "PhoneAppVersion"
       render_403 if  !User.current.logged? && !(@attachment.container_type == 'OrgSubfield' && @attachment.container.organization.allow_guest_download) && !(@attachment.container_type == 'OrgDocumentComment' && @attachment.container.organization.allow_guest_download)
     end
   end
 end
-end

app/views/layouts/base_org_newstyle.html.erb

@@ -14,7 +14,7 @@
   <%= javascript_include_tag 'attachments' %>
   <%#= call_hook :view_layouts_base_html_head %>
   <!-- page specific tags -->
-  <%= yield :header_tags -%>
+  <%#= yield :header_tags -%>
   <!-- MathJax的配置 -->
   <script type="text/javascript"
           src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">