Protect against missing canonical in conversationCanonicalAdapterFactory.

svn path=/plone.app.discussion/trunk/; revision=37410

CHANGES.txt

@@ -4,6 +4,9 @@ Changelog
 1.0b5 (unreleased)
 ------------------
 
+* Protect against missing canonical in conversationCanonicalAdapterFactory.
+  [hannosch]
+
 * Documentation for Captcha plugin architecture and email notification added.
   See http://packages.python.org/plone.app.discussion.
   [timo]

plone/app/discussion/conversation.py

@@ -373,7 +373,9 @@ else:
         so that comments will be shared across all translations.
         """
         if ITranslatable.providedBy(content):
-            content = content.getCanonical()
+            canonical = content.getCanonical()
+            if canonical is not None:
+                return conversationAdapterFactory(canonical)
         return conversationAdapterFactory(content)