[Erp5-report] r38935 kazuhiko - in /erp5/trunk/bt5/erp5_base: SkinTemplateItem/portal_skins...

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Wed Oct  6 20:27:36 2010
New Revision: 38935

URL: http://svn.erp5.org?rev=38935&view=rev
Log:
we need encode('utf-8') here, because the output of PageTemplate is unicode, not str in Zope-2.12.

Modified:
    erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_getSummaryAsHTML.xml
    erp5/trunk/bt5/erp5_base/bt/revision

Modified: erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_getSummaryAsHTML.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_getSummaryAsHTML.xml?rev=38935&r1=38934&r2=38935&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_getSummaryAsHTML.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_getSummaryAsHTML.xml [utf8] Wed Oct  6 20:27:36 2010
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -88,8 +85,8 @@ uid = context.getUid()\n
 url = context.absolute_url()\n
 title = context.getTitle() or (hasattr(context, \'getReference\') and context.getReference()) or context.getId()\n
 portal_type = context.getTranslatedPortalType()\n
-website = context.getWebSiteValue() or context.REQUEST.get(\'current_web_site\')\n
-popup = context.Document_getPopupInfo(context.REQUEST.get(\'current_web_site\')) or \'\'\n
+website = context.REQUEST.get(\'current_web_site\', context.getWebSiteValue())\n
+popup = (context.Document_getPopupInfo(website) or \'\').encode(\'utf-8\')\n
 \n
 found = context.Base_showFoundText()\n
 owner_html = getOwnerHTML(context) or \'\'\n

Modified: erp5/trunk/bt5/erp5_base/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/bt/revision?rev=38935&r1=38934&r2=38935&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/bt/revision [utf8] Wed Oct  6 20:27:36 2010
@@ -1 +1 @@
-869
\ No newline at end of file
+870
\ No newline at end of file