Merge branch 'wikilinks'

diff --git a/app/views/site/edit.html.erb b/app/views/site/edit.html.erb
index 3565b046816d41658434471f34efdedfd113d7e9..779abd352b659324992a20c4efd53fc924180066 100644 (file)
--- 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 (file)
index 0000000..6cd6b64
--- /dev/null
+++ b/db/.gitignore
@@ -0,0 +1 @@
+*_structure.sql

diff --git a/db/functions/.gitignore b/db/functions/.gitignore
new file mode 100644 (file)
index 0000000..9d22eb4
--- /dev/null
+++ b/db/functions/.gitignore
@@ -0,0 +1,2 @@
+*.o
+*.so