Skip to content
This repository
Browse code

Merge pull request #1327 from ojii/feature/document-moderator-depreca…

…tion

Document moderator deprecation, fixes #1322
  • Loading branch information...
commit 582807dd6a6a111e159b02533af3b93b69c2f68d 2 parents 1dd8cfb + a3fe35e
Jonas Obrist authored June 29, 2012
3  cms/conf/__init__.py
@@ -18,6 +18,9 @@ def patch_settings():
18 18
     if getattr(settings, 'CMS_FLAT_URLS', False):
19 19
         warnings.warn("CMS_FLAT_URLS are deprecated and will be removed in django CMS 2.4!", DeprecationWarning)
20 20
     
  21
+    if getattr(settings, 'CMS_MODERATOR', False):
  22
+        warnings.warn("CMS_MODERATOR will be removed and replaced in django CMS 2.4!", DeprecationWarning)
  23
+    
21 24
     from cms.conf import global_settings
22 25
     # patch settings
23 26
     
2  docs/upgrade/2.3.rst
Source Rendered
@@ -85,3 +85,5 @@ Pending deprecations
85 85
 ********************
86 86
 
87 87
 The ``CMS_FLAT_URLS`` setting is deprecated and will be removed in version 2.4.
  88
+The moderation feature (``CMS_MODERATOR = True``) will be deprecated in 2.4 and
  89
+replaced with a simpler way of handling unpublished changes. 

0 notes on commit 582807d

Please sign in to comment.
Something went wrong with that request. Please try again.