[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/ Fixed AttributeError for allowDiscussion when importing a GenericSetup structure tarball.

[Maurits van Rees]

Log message for revision 129048:
  Fixed AttributeError for allowDiscussion when importing a GenericSetup structure tarball.
  
  See https://bugs.launchpad.net/zope-cmf/+bug/1042836/
  Merged from branch 2.2 r129047.
  

Changed:
  U   Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt
  U   Products.CMFDefault/trunk/Products/CMFDefault/DiscussionTool.py

-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt	2013-01-17 17:57:59 UTC (rev 129047)
+++ Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt	2013-01-17 18:04:03 UTC (rev 129048)
@@ -4,6 +4,10 @@
 2.3.0 (unreleased)
 ------------------
 
+- Fixed AttributeError for allowDiscussion when importing a
+  GenericSetup structure tarball.
+  See https://bugs.launchpad.net/zope-cmf/+bug/1042836/
+
 - browser views: Added 'registered_email' and 'password_email' views.
   Please note that these views override the corresponding skin methods. If you
   want to use customized versions from the skins tool you have to make sure

Modified: Products.CMFDefault/trunk/Products/CMFDefault/DiscussionTool.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/DiscussionTool.py	2013-01-17 17:57:59 UTC (rev 129047)
+++ Products.CMFDefault/trunk/Products/CMFDefault/DiscussionTool.py	2013-01-17 18:04:03 UTC (rev 129048)
@@ -80,6 +80,10 @@
                     pass
         else:
             # https://bugs.launchpad.net/zope-cmf/+bug/1042836/
+            if allowDiscussion in ('True', 'true', 'on'):
+                allowDiscussion = True
+            elif allowDiscussion in ('False', 'false', 'off'):
+                allowDiscussion = False
             content.allow_discussion = bool(int(allowDiscussion))
 
     security.declarePublic( 'getDiscussionFor' )