Fixed mixed escaping errors

4 files changed, 5 insertions, 5 deletions

diff --git a/web/lib/ui/keys.rb b/web/lib/ui/keys.rb
index 84e23f3..f53c73b 100644
--- a/web/lib/ui/keys.rb
+++ b/web/lib/ui/keys.rb
@@ -10,7 +10,7 @@ class Taginfo < Sinatra::Base
 
         @key_uri  = escape(@key)
 
-        @title = [escape_html(@key), t.osm.keys]
+        @title = [@key, t.osm.keys]
         section :keys
 
         @filter_type = get_filter()
diff --git a/web/lib/ui/tags.rb b/web/lib/ui/tags.rb
index 8c4db79..8018ab2 100644
--- a/web/lib/ui/tags.rb
+++ b/web/lib/ui/tags.rb
@@ -21,7 +21,7 @@ class Taginfo < Sinatra::Base
 
         @key_uri  = escape(@key)
 
-        @title = [escape_html(@key) + '=' + escape_html(@value), t.osm.tags]
+        @title = [@key + '=' + @value, t.osm.tags]
         section :tags
 
         @filter_type = get_filter()
diff --git a/web/lib/utils.rb b/web/lib/utils.rb
index da47f10..00b710e 100644
--- a/web/lib/utils.rb
+++ b/web/lib/utils.rb
@@ -87,10 +87,10 @@ end
 
 def turbo_link(filter, key, value=nil)
     template = 'key';
-    parameters = { :key => Rack::Utils::escape(key) }
+    parameters = { :key => key }
 
     unless value.nil?
-        parameters[:value] = Rack::Utils::escape(value);
+        parameters[:value] = value;
         template += '-value'
     end
 
diff --git a/web/views/key.erb b/web/views/key.erb
index 375a88b..bbff984 100644
--- a/web/views/key.erb
+++ b/web/views/key.erb
@@ -42,7 +42,7 @@
         <h2><%= h(t.taginfo.overview) %></h2>
         <table id="grid-overview">
         </table>
-        <p><span title="<%= h(t.pages.key.overview.no_endorsement) %>" tipsy="n"><%= h(t.pages.key.overview.objects_last_edited_by(@user_count.to_s_with_ts)) %></span></p>
+        <p><span title="<%= h(t.pages.key.overview.no_endorsement) %>" tipsy="n"><%= t.pages.key.overview.objects_last_edited_by(@user_count.to_s_with_ts) %></span></p>
     </div>
     <div id="values">
         <h2><%= h(t.pages.key.values_used) %></h2>