Permalink
Browse files

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

…tion

Document moderator deprecation, fixes #1322
  • Loading branch information...
2 parents 1dd8cfb + a3fe35e commit 582807dd6a6a111e159b02533af3b93b69c2f68d @ojii ojii committed Jun 29, 2012
Showing with 5 additions and 0 deletions.
  1. +3 −0 cms/conf/__init__.py
  2. +2 −0 docs/upgrade/2.3.rst
@@ -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
@@ -85,3 +85,5 @@ Pending deprecations
********************
The ``CMS_FLAT_URLS`` setting is deprecated and will be removed in version 2.4.
+The moderation feature (``CMS_MODERATOR = True``) will be deprecated in 2.4 and
+replaced with a simpler way of handling unpublished changes.

0 comments on commit 582807d

Please sign in to comment.