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 d93e3e0235170b9f8d7313c11c5febc526180cba..e6da08ae2c7f72223126bfed8a8fbca22be1ba8b 100644 (file)
--- 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? %>
 <% 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 %>
 <% else %>
   <% lon = @user.home_lon %>
   <% lat = @user.home_lat %>

diff --git a/app/views/site/edit.rhtml b/app/views/site/edit.rhtml
index 16c2ef3f27ef835e6790df60d4df50857ed57b62..4cd01dcc946cfd8b3a96a040ee36f51ba138cb35 100644 (file)
--- 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'])  %>
 <% 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%>
 <% 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
 <% 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 395c851d47c5640cbca22e8512e05f3aa3d4889f..fa012287aa48bbc59736a3f39dc7de137b3e31b9 100644 (file)
--- 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']) %>
 <% 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']) %>
 <% 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(",") %>
 <% 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' %>
 <% else %>
 <% lon =  '-0.1' %>
 <% lat =  '51.5' %>

-<% zoom =  h(params['zoom']) || '5' %>
+<% zoom =  h(params['zoom'] || '5') %>

 <% layers = h(params['layers']) %>
 <% end %>
 <% end %>
 <% layers = h(params['layers']) %>
 <% end %>
 <% end %>

diff --git a/app/views/user/account.rhtml b/app/views/user/account.rhtml
index 1a18c90b21575eb46d54c56dee5a978a338fef9d..0f938df26770a0fe93030476b417d2a29dfedd7f 100644 (file)
--- 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? %>
 </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 %> 
 <% else %>
   <% marker = true %>
   <% mlon = @user.home_lon %>