Merge pull request django-cms#1566 from stefanfoulis/feature/issue-15…

…49-endless-redirect-with-setting-overrides fixes django-cms#1549 endless redirect if browser language is not a cms language
rizumu · Dec 20, 2012 · 2d52567 · 2d52567
2 parents 654b666 + 389fa3a
commit 2d52567
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/cms/views.py b/cms/views.py
@@ -63,9 +63,10 @@ def details(request, slug):
                 with SettingsOverride(LANGUAGES=languages, LANGUAGE_CODE=languages[0][0]):
                     #get supported language
                     new_language = translation.get_language_from_request(request)
-                    with force_language(new_language):
+                    if new_language in get_public_languages():
-                        pages_root = reverse('pages-root')
+                        with force_language(new_language):
-                        return HttpResponseRedirect(pages_root + attrs)
+                            pages_root = reverse('pages-root')
+                            return HttpResponseRedirect(pages_root + attrs)
             else:
                 _handle_no_page(request, slug)
         else: