From: Tom Hughes <tom@compton.nu>
Date: Tue, 20 Apr 2010 20:47:57 +0000 (+0100)
Subject: Merge branch 'wikilinks'
X-Git-Tag: live~7430^2~1
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/9816c7dd0a6880589f2310f64b1acf672f4497e5?hp=546250f60b923c120960e7a1ad9f8176008ce6eb

Merge branch 'wikilinks'
---

diff --git a/app/views/site/edit.html.erb b/app/views/site/edit.html.erb
index 3565b0468..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']
diff --git a/db/.gitignore b/db/.gitignore
new file mode 100644
index 000000000..6cd6b6466
--- /dev/null
+++ b/db/.gitignore
@@ -0,0 +1 @@
+*_structure.sql
diff --git a/db/functions/.gitignore b/db/functions/.gitignore
new file mode 100644
index 000000000..9d22eb46a
--- /dev/null
+++ b/db/functions/.gitignore
@@ -0,0 +1,2 @@
+*.o
+*.so