Permalink
Browse files

Merge branch 'fixflaturls' into mitar-fixes

  • Loading branch information...
mitar committed Jul 15, 2012
2 parents 625e8de + c50c492 commit 0bcf0409d5a052f136850cd03f6b54149a3983c5
Showing with 4 additions and 1 deletion.
  1. +4 −1 cms/appresolver.py
View
@@ -171,7 +171,10 @@ def get_app_patterns():
# Loop over all titles with an application hooked to them
for title in title_qs.exclude(application_urls=None).exclude(application_urls='').select_related():
- path = title.path
+ if settings.CMS_FLAT_URLS:
+ path = title.slug
+ else:
+ path = title.path
if use_namespaces:
mixid = "%s:%s:%s" % (path + "/", title.application_urls, title.language)
else:

0 comments on commit 0bcf040

Please sign in to comment.