From: Tom Hughes <tom@compton.nu>
Date: Sat, 24 Nov 2007 14:13:21 +0000 (+0000)
Subject: Wrap evaluation of default values for parameters inside the HTML escaping
X-Git-Tag: live~8017
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/7de4cb19b8cbaa123f9d47ac4ba9f37e25e5724c?ds=sidebyside

Wrap evaluation of default values for parameters inside the HTML escaping
as that causes nil to become "" hence defeating the conditional default.
---

diff --git a/app/views/diary_entry/new.rhtml b/app/views/diary_entry/new.rhtml
index d93e3e023..e6da08ae2 100644
--- a/app/views/diary_entry/new.rhtml
+++ b/app/views/diary_entry/new.rhtml
@@ -23,9 +23,9 @@
 <% end %>
 
 <% if @user.home_lat.nil? or @user.home_lon.nil? %>
-  <% lon = h(params['lon']) || '-0.1' %>
-  <% lat = h(params['lat']) || '51.5' %>
-  <% zoom = h(params['zoom']) || '4' %> 
+  <% lon = h(params['lon'] || '-0.1') %>
+  <% lat = h(params['lat'] || '51.5') %>
+  <% zoom = h(params['zoom'] || '4') %> 
 <% else %>
   <% lon = @user.home_lon %>
   <% lat = @user.home_lat %>
diff --git a/app/views/site/edit.rhtml b/app/views/site/edit.rhtml
index 16c2ef3f2..4cd01dcc9 100644
--- a/app/views/site/edit.rhtml
+++ b/app/views/site/edit.rhtml
@@ -26,15 +26,15 @@
 <% if params['mlon'] and params['mlat'] %>
 <% lon =  h(params['mlon']) %>
 <% lat =  h(params['mlat'])  %>
-<% zoom =  h(params['zoom']) || '12' %>
+<% zoom =  h(params['zoom'] || '12') %>
 <% elsif @user and params['lon'].nil? and params['lat'].nil? %> 
 <% lon =  @user.home_lon %>
 <% lat =  @user.home_lat %>
 <% zoom = '12' %>
 <%else%>
-<% lon =  h(params['lon']) || '-0.1' %>
-<% lat =  h(params['lat']) || '51.5' %>
-<% zoom =  h(params['zoom']) || '12' %>
+<% lon =  h(params['lon'] || '-0.1') %>
+<% lat =  h(params['lat'] || '51.5') %>
+<% zoom =  h(params['zoom'] || '12') %>
 <% end %>
 
 <div id="map">You need a Flash player to use Potlatch, the
diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index 395c851d4..fa012287a 100644
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -43,12 +43,12 @@ by the OpenStreetMap project and it's contributors.
 <% if params['lon'] and params['lat'] %>
 <% lon =  h(params['lon']) %>
 <% lat =  h(params['lat']) %>
-<% zoom =  h(params['zoom']) || '5' %>
+<% zoom =  h(params['zoom'] || '5') %>
 <% layers = h(params['layers']) %>
 <% elsif params['mlon'] and params['mlat'] %>
 <% lon = h(params['mlon']) %> 
 <% lat = h(params['mlat']) %>
-<% zoom =  h(params['zoom']) || '12' %>
+<% zoom =  h(params['zoom'] || '12') %>
 <% layers = h(params['layers']) %>
 <% elsif cookies.key?("location") %>
 <% lon,lat,zoom,layers = cookies["location"].value.first.split(",") %>
@@ -67,7 +67,7 @@ by the OpenStreetMap project and it's contributors.
 <% else %>
 <% lon =  '-0.1' %>
 <% lat =  '51.5' %>
-<% zoom =  h(params['zoom']) || '5' %>
+<% zoom =  h(params['zoom'] || '5') %>
 <% layers = h(params['layers']) %>
 <% end %>
 <% end %>
diff --git a/app/views/user/account.rhtml b/app/views/user/account.rhtml
index 1a18c90b2..0f938df26 100644
--- a/app/views/user/account.rhtml
+++ b/app/views/user/account.rhtml
@@ -34,9 +34,9 @@
 </script>
 
 <% if @user.home_lat.nil? or @user.home_lon.nil? %>
-  <% lon = h(params['lon']) || '-0.1' %>
-  <% lat = h(params['lat']) || '51.5' %>
-  <% zoom = h(params['zoom']) || '4' %> 
+  <% lon = h(params['lon'] || '-0.1') %>
+  <% lat = h(params['lat'] || '51.5') %>
+  <% zoom = h(params['zoom'] || '4') %> 
 <% else %>
   <% marker = true %>
   <% mlon = @user.home_lon %>