From 4cd7c2886a20eee854691a7f7a5b90c2e2b568d6 Mon Sep 17 00:00:00 2001 From: Ivan Tyagov <ivan@nexedi.com> Date: Fri, 15 Oct 2010 11:59:27 +0000 Subject: [PATCH] Revert r39223 ass due to different Zope PT's implementation we require explicit conversion. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@39226 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../portal_skins/erp5_base/Base_getSummaryAsHTML.xml | 4 ++++ bt5/erp5_base/bt/revision | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_getSummaryAsHTML.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_getSummaryAsHTML.xml index c9863a65dc..820f94f939 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_getSummaryAsHTML.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_getSummaryAsHTML.xml @@ -88,6 +88,8 @@ portal_type = context.getTranslatedPortalType()\n website = context.REQUEST.get(\'current_web_site\', context.getWebSiteValue())\n \n popup = context.Document_getPopupInfo(website) or \'\'\n +if isinstance(popup, unicode):\n + popup = popup.encode(\'utf-8\')\n \n found = context.Base_showFoundText()\n owner_html = getOwnerHTML(context) or \'\'\n @@ -191,6 +193,8 @@ return html\n <string>title</string> <string>portal_type</string> <string>popup</string> + <string>isinstance</string> + <string>unicode</string> <string>found</string> <string>owner_html</string> <string>date_renderer</string> diff --git a/bt5/erp5_base/bt/revision b/bt5/erp5_base/bt/revision index d4f7b8f432..9d5369769d 100644 --- a/bt5/erp5_base/bt/revision +++ b/bt5/erp5_base/bt/revision @@ -1 +1 @@ -886 \ No newline at end of file +887 \ No newline at end of file -- 2.30.9