Merge pull request #1493 from alesdotio/fallbacks-patch

fixed a bug in language fallback settings
django-cms · Oct 25, 2012 · 96003df · 96003df
2 parents af529e6 + 6e9cbf0
commit 96003df
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/cms/conf/patch.py b/cms/conf/patch.py
@@ -122,7 +122,7 @@ def post_patch_check():
                                 tmp_language['public'] = True
                         if tmp_language['public']:
                             fallbacks.append(tmp_language['code'])
-                    if fallbacks:
+                    if fallbacks and language['code'] in fallbacks:
                         fallbacks.remove(language['code'])
                     if settings.CMS_LANGUAGES.has_key('default'):
                         language['fallbacks'] = settings.CMS_LANGUAGES['default'].get('fallbacks', fallbacks)