X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/019746068992d03c1bbf4f46282a552552ea9e0c..10dca1b6dfa11f6b40a58facad74434fa4295fbd:/app/views/site/edit.html.erb?ds=inline

diff --git a/app/views/site/edit.html.erb b/app/views/site/edit.html.erb
index d3258c9cf..779abd352 100644
--- a/app/views/site/edit.html.erb
+++ b/app/views/site/edit.html.erb
@@ -20,7 +20,7 @@
 <%= render :partial => 'search' %>
 
 <%
-session[:token] = @user.tokens.create.token unless session[:token]
+session[:token] = @user.tokens.create.token unless session[:token] and UserToken.find_by_token(session[:token])
 
 # Decide on a lat lon to initialise potlatch with. Various ways of doing this
 if params['lon'] and params['lat']
@@ -65,7 +65,7 @@ zoom='14' if zoom.nil?
   
   window.onbeforeunload=function() {
     if (!changesaved) {
-      return '#{escape_javascript(t('site.edit.potlatch_unsaved_changes'))}';
+      return '<%= escape_javascript(t('site.edit.potlatch_unsaved_changes')) %>';
     }
   }
 
@@ -88,7 +88,7 @@ zoom='14' if zoom.nil?
   doSWF(<%= lat || 'null' %>,<%= lon || 'null' %>,<%= zoom %>);
 
   function setPosition(lat, lon, zoom) {
-    doSWF(lat, lon, zoom);
+    doSWF(lat, lon, zoom || 15);
   }
 
   function resizeContent() {