From 6c3b5aa9d46577818723e669d6fc64f1bb30cc01 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Sun, 14 Nov 2010 17:36:46 +0000
Subject: [PATCH] Only Potlatch 1 needs a token to be created

---
 app/controllers/site_controller.rb | 2 --
 app/views/site/_potlatch.html.erb  | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index d08f34a0a..e6d09f18d 100644
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -37,8 +37,6 @@ class SiteController < ApplicationController
     if editor == "josm"
       render :action => :index
     else
-      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']
         @lon = params['lon'].to_f
diff --git a/app/views/site/_potlatch.html.erb b/app/views/site/_potlatch.html.erb
index c255cef91..68205b6ff 100644
--- a/app/views/site/_potlatch.html.erb
+++ b/app/views/site/_potlatch.html.erb
@@ -3,6 +3,9 @@
 </div>
 
 <%= javascript_include_tag 'swfobject.js' %>
+
+<% session[:token] = @user.tokens.create.token unless session[:token] and UserToken.find_by_token(session[:token]) %>
+
 <script type="text/javascript" defer="defer">
   var brokenContentSize = $("content").offsetWidth == 0;
   var fo = new SWFObject("/potlatch/potlatch.swf?d="+Math.round(Math.random()*1000), "potlatch", "100%", "100%", "6", "#FFFFFF");
-- 
2.43.2