diff --git a/CHANGES.txt b/CHANGES.txt index b9371db..d78b8f4 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -4,7 +4,11 @@ Changelog 1.0RC1 (unreleased) ------------------- -- Disable all commenting options in the discussion control panel when comments +- Do not allow to change the mail settings in the discussion control panel, if + there is no valid mail setup. + [timo] + +- Disable all commenting options in the discussion control panel if comments are disabled globally. - Check for the 'review comments' permission instead of 'manage' to decide diff --git a/plone/app/discussion/browser/controlpanel.pt b/plone/app/discussion/browser/controlpanel.pt index 25af7f6..31c3bd3 100644 --- a/plone/app/discussion/browser/controlpanel.pt +++ b/plone/app/discussion/browser/controlpanel.pt @@ -18,7 +18,7 @@