Merge branch 'master' of git://github.com/f4nt/django-cms-2.0

django-cms · Nov 4, 2009 · 3205b6d · 3205b6d
2 parents 4be6c99 + 91ce9bf
commit 3205b6d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/cms/urls.py b/cms/urls.py
@@ -5,7 +5,7 @@
 urlpatterns = (
     # Public pages
     url(r'^$', details, {'slug':''}, name='pages-root'),
-    url(r'^(?P<slug>[0-9A-Za-z-_//]+)/$', details, name='pages-details-by-slug'),
+    url(r'^(?P<slug>[0-9A-Za-z-_.//]+)/$', details, name='pages-details-by-slug'),
 )
 
 if settings.CMS_APPLICATIONS_URLS:

diff --git a/cms/utils/urlutils.py b/cms/utils/urlutils.py
@@ -2,7 +2,7 @@
 from django.conf import settings
 
 # checks validity of absolute / relative url
-any_path_re = re.compile('^/?[a-zA-Z0-9_-]+(/[a-zA-Z0-9_-]+)*/?$') 
+any_path_re = re.compile('^/?[a-zA-Z0-9_.-]+(/[a-zA-Z0-9_.-]+)*/?$') 
 
 def levelize_path(path):
     """Splits given path to list of paths removing latest level in each step.
@@ -43,4 +43,4 @@ def urljoin(*segments):
 
     if settings.APPEND_SLASH and not url.endswith("/"):
         url += "/"
-    return url
+    return url