[cc-commits] [SCM] License chooser & etc (branch master) updated. c07581b57b46709d5baf8be8d35e770263ea4519

git version control git at a7.creativecommons.org
Mon Jul 19 22:46:24 EDT 2010


The branch, master has been updated
       via  c07581b57b46709d5baf8be8d35e770263ea4519 (commit)
      from  4dadf486a79cca7d9d7c58841eedfe1add986005 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c07581b57b46709d5baf8be8d35e770263ea4519
Author: Christopher Allan Webber <cwebber at dustycloud.org>
Date:   Mon Jul 19 21:51:25 2010 -0500

    We should only 404 on languages when they were requested as part of the URL

-----------------------------------------------------------------------

Summary of changes (followed by patch):
 cc/engine/licenses/views.py |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/cc/engine/licenses/views.py b/cc/engine/licenses/views.py
index 764c8e4..325b687 100644
--- a/cc/engine/licenses/views.py
+++ b/cc/engine/licenses/views.py
@@ -74,7 +74,10 @@ def license_deed_view(request, license):
     active_languages = util.active_languages()
     active_lang_codes = [lang['code'] for lang in active_languages]
 
-    if not target_lang in active_lang_codes:
+    # When the target_lang is determined by the url, we should make
+    # sure that's a real language to prevent caching bogus stuff
+    if not target_lang in active_lang_codes \
+            and request.matchdict.has_key('target_lang'):
         return exc.HTTPNotFound()
 
     deed_template = util.get_zpt_template(


hooks/post-receive
-- 
License chooser & etc



More information about the cc-commits mailing list