Merge commit '32239cb5ff18e9e29ed5d2a6ffb5d230c61d8db2'

AUTHORS

@@ -26,6 +26,8 @@ Contributors (in alphabetical order):
 * Alberto Paro
 * Alessandro Ronchi
 * Aleš Kocjančič
+* Alexandre Leray
+* Alexey Subbotin
 * Alvin Mites
 * Andrew Cassidy
 * Andrew Schoen
@@ -42,7 +44,9 @@ Contributors (in alphabetical order):
 * beshrkayali
 * Bob Karreman
 * Bouke Haarsma
+* Braden MacDonald
 * brightwhitefox
+* Calvin Cheng
 * Chanita Siridechkun
 * Charpentier Johan
 * Cheng-Chia Tseng
@@ -51,7 +55,6 @@ Contributors (in alphabetical order):
 * Chris Wesseling
 * Christof Hagedorn
 * Conrado Bührer
-* Daniele Procida
 * DaNmarner
 * Darryl Woods
 * David Jean Louis
@@ -63,15 +66,22 @@ Contributors (in alphabetical order):
 * Egor V. Nazarkin
 * Ekrem Seren
 * Erik Allik
+* Eugen MechanisM
 * Evandro Miquelito
+* F. Gabriel Gosselin
 * f4nt
 * fcurella
 * Filip Kazimierczak
 * Frank Bieniek
+* Gabe Jackson
 * Gabriel Hurley
 * GaretJax
+* Geoffrey Hing
 * George Marshall
 * Gerard Świderski
+* guandalino
+* hedberg
+* Herbert Poul
 * homebrew79
 * hysia
 * Iacopo Spalletti
@@ -133,6 +143,7 @@ Contributors (in alphabetical order):
 * mrlundis
 * MW
 * neoprolog
+* Nickolay V. Shmyrev
 * Orne Brocaar
 * padelt
 * Paolo
@@ -153,7 +164,9 @@ Contributors (in alphabetical order):
 * Rebecca Breu
 * Remco Wendt
 * Restless Being
+* Robert Clark
 * Robert Pogorzelski
+* Robin Lewis
 * Rodolfo Carvalho
 * rtpm
 * Samuel Lüscher
@@ -173,11 +186,13 @@ Contributors (in alphabetical order):
 * ssteinerX
 * Stavros Korokithakis
 * Stephan Jaekel
+* Stephen Muss
 * Steve R. Jones
 * Steve Steiner
 * Tanel Külaots
 * Thomas Parslow
 * timesong
+* Tim Davies
 * Tino de Bruijn
 * tiret
 * Ulrich Petri

cms/__init__.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-__version__ = '2.3rc2'
+__version__ = '2.3'
 
 # patch settings 
 try:

cms/appresolver.py

@@ -76,8 +76,9 @@ def recurse_patterns(path, pattern_list, page_id):
     newpatterns = []
     for pattern in pattern_list:
         app_pat = pattern.regex.pattern
-        if app_pat.startswith('^'):
-            app_pat = app_pat[1:]
+        # make sure we don't get patterns that start with more than one '^'!
+        app_pat = app_pat.lstrip('^')
+        path = path.lstrip('^')
         regex = r'^%s%s' % (path, app_pat)
         if isinstance(pattern, RegexURLResolver):
             # this is an 'include', recurse!

cms/conf/__init__.py

@@ -18,6 +18,9 @@ def patch_settings():
     if getattr(settings, 'CMS_FLAT_URLS', False):
         warnings.warn("CMS_FLAT_URLS are deprecated and will be removed in django CMS 2.4!", DeprecationWarning)
 
+    if getattr(settings, 'CMS_MODERATOR', False):
+        warnings.warn("CMS_MODERATOR will be removed and replaced in django CMS 2.4!", DeprecationWarning)
+
     from cms.conf import global_settings
     # patch settings