summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorScott Ostler <scottbot9000@gmail.com>2010-08-23 16:02:56 -0400
committerScott Ostler <scottbot9000@gmail.com>2010-08-23 16:02:56 -0400
commit3e9161e16068b0347e26438de6fb0cb8692d8173 (patch)
tree69ba37589a40d215c61e9864ccdb9811e588e009 /src
parent82c08bc3cf6191146f10cc3cba605f5226281243 (diff)
parent5bc995cc19ea506b7b4888f849b4c1895547cf02 (diff)
Merge branch 'master' of ssh://dump.fm/pichat/repo
Diffstat (limited to 'src')
-rw-r--r--src/site.clj6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/site.clj b/src/site.clj
index 4ed5d29..0a22a88 100644
--- a/src/site.clj
+++ b/src/site.clj
@@ -248,9 +248,7 @@
;; Landing
(defn landing [session]
- (if (session :nick)
- (redirect-to "/chat")
- (serve-file "static" "index.html")))
+ (redirect-to "/chat"))
(defn log-login [user_id ip]
;; i'm using do-cmds here because update-values can't deal with stuff like 'last_login = now()'
@@ -1161,7 +1159,7 @@ order by count desc limit ? offset ?")
(GET "/login" (login session params cookies request))
(GET "/logout" (logout session))
(GET "/register" (serve-static "static" "register.html"))
- (GET "/dis-register" (serve-static "static" "registerdis.html"))
+ (GET "/registerdis" (serve-static "static" "registerdis.html"))
(GET "/browser" (browser session))
(GET "/refresh" (validated-refresh session params))
(GET "/tag/:tag" (tagged-dumps session params (request-url request)))