diff --git a/.gitignore b/.gitignore index 283a8cc..b1d490d 100644 --- a/.gitignore +++ b/.gitignore @@ -17,10 +17,12 @@ pom.xml.asc smeagol.log* /node_modules/ .DS_Store -.calva/ -.idea/ -.lsp/ .clj-kondo/ +.idea/ +.calva/ +.lsp +.eastwood +smeagol.iml resources/public/content/uploads/ diff --git a/src/smeagol/routes/wiki.clj b/src/smeagol/routes/wiki.clj index 0944f5c..e59e136 100644 --- a/src/smeagol/routes/wiki.clj +++ b/src/smeagol/routes/wiki.clj @@ -380,12 +380,13 @@ (or (show-sanity-check-error) (let [params (keywordize-keys (:params request)) + headers (keywordize-keys (:headers request)) form-params (keywordize-keys (:form-params request)) username (:username form-params) password (:password form-params) action (:action form-params) user (session/get :user) - redirect-to (:redirect-to params)] + redirect-to (or (:redirect-to params) (:referer headers))] (when redirect-to (log/info (str "After auth, redirect to: " redirect-to))) (cond (= action (get-message :logout-label request))