From: Tom Hughes Date: Sun, 22 May 2011 16:59:35 +0000 (+0100) Subject: Merge branch 'master' into openstreetbugs X-Git-Tag: live~5096^2~146 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/5ff9f2d21c82a9ebe06be748a37de764d0861514?hp=83821816359187fa2b877a29b7ab7d9f974c17b5 Merge branch 'master' into openstreetbugs --- diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index c24e7ff5b..6e2ecd323 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -50,7 +50,7 @@ module ApplicationHelper css << ".show_if_user_#{@user.id} { display: inline }" if @user; css << ".hide_unless_administrator { display: none }" unless @user and @user.administrator?; - return content_tag(:style, css) + return content_tag(:style, css, :type => "text/css") end def if_logged_in(tag = :div, &block) diff --git a/app/views/site/_search.html.erb b/app/views/site/_search.html.erb index f487e8f4a..8c5bd8b80 100644 --- a/app/views/site/_search.html.erb +++ b/app/views/site/_search.html.erb @@ -1,9 +1,5 @@