From 6e07d4c76177d25764b21f73deae0da4b1425179 Mon Sep 17 00:00:00 2001
From: Tristan Cavelier <tristan.cavelier@nexedi.com>
Date: Wed, 23 Dec 2015 04:27:00 -0500
Subject: [PATCH] erp5_dicussion: take enable preferences only in
 ERP5Site_getUserPreferredForumSettingDict

also remove a useless portal_catalog parameter
---
 .../ERP5Site_getUserPreferredForumSettingsDict.xml           | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/ERP5Site_getUserPreferredForumSettingsDict.xml b/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/ERP5Site_getUserPreferredForumSettingsDict.xml
index d6f7d7647a..cc1ffffbfd 100644
--- a/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/ERP5Site_getUserPreferredForumSettingsDict.xml
+++ b/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/ERP5Site_getUserPreferredForumSettingsDict.xml
@@ -62,9 +62,8 @@ def getPreferredForumSignature(username):\n
             \'preferred_forum_quote_original_message\': False}\n
   preference = portal.portal_catalog.getResultValue(\n
                                        portal_type=\'Preference\',\n
-                                       owner = username,\n
-                                       preference_state=\'enabled\')\n
-  if preference is not None:\n
+                                       owner = username)\n
+  if preference is not None and preference.getPreferenceState() == "enabled":\n
     result[\'preferred_forum_signature\'] = preference.getPreferredForumSignature()\n
     result[\'preferred_forum_quote_original_message\'] = preference.getPreferredForumQuoteOriginalMessage()\n
 \n
-- 
2.30.9