summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordumpfmprod <dumpfmprod@ubuntu.(none)>2010-04-14 09:13:03 -0400
committerdumpfmprod <dumpfmprod@ubuntu.(none)>2010-04-14 09:13:03 -0400
commitc479038b4431c101d6b00918c9ee16d3ef3fa0c8 (patch)
tree098baa926c65d689d9b4dc6c8f31842185fe2441
parent6fdfc1fd9577e6a1415241b43ee0d6354a155933 (diff)
sostler prod
-rw-r--r--src/site.clj1
-rw-r--r--static/js/pichat.js2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/site.clj b/src/site.clj
index ca8bc9d..3686bb9 100644
--- a/src/site.clj
+++ b/src/site.clj
@@ -1029,6 +1029,7 @@
(decorate multipart
(with-mimetypes {:mimetypes mimetypes})
+ (with-cookie-login (comp not logged-in?) make-login-token read-login-token)
(with-session {:type :memory, :expires (* 60 60)})
(with-multipart))
diff --git a/static/js/pichat.js b/static/js/pichat.js
index d7728cc..97379ef 100644
--- a/static/js/pichat.js
+++ b/static/js/pichat.js
@@ -135,7 +135,7 @@ function getUriType(uri){
if (PicRegex.test(uri.file.toLowerCase()))
return "image";
- if (parseDomain(uri.host) == "youtube.com" && 'v' in uri.queryKey)
+ if (parseDomain(uri.host) == "youtube.com" && 'v' in uri.queryKey || uri.anchor.indexOf('v') != -1)
return "youtube";
return "link";