diff --git a/bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/WebPage_viewAsBook.py b/bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/WebPage_viewAsBook.py index 1d77fe8441ff52bd4abc66044b4c1bca8295ed4f..c3be21a5ec10f1e0e06db201df955277b93d1975 100644 --- a/bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/WebPage_viewAsBook.py +++ b/bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/WebPage_viewAsBook.py @@ -35,7 +35,6 @@ MAIN FILE: generate book in different output formats import re import six -from Products.PythonScripts.standard import html_quote from Products.ERP5Type.Utils import str2bytes, bytes2str, unicode2str from base64 import b64encode @@ -79,11 +78,11 @@ book_modification_date = book.getModificationDate() book_language = book.getLanguage() # XXX sigh for passing "" around -book_reference = html_quote(override_document_reference) if override_document_reference else book.getReference() -book_short_title = html_quote(override_document_short_title) if override_document_short_title else book.getShortTitle() -book_version = html_quote(override_document_version) if override_document_version else book.getVersion() or "001" -book_description = html_quote(override_document_description) if override_document_description else book.getDescription() -book_title = html_quote(override_document_title) if override_document_title else book.getTitle() +book_reference = override_document_reference if override_document_reference else book.getReference() +book_short_title = override_document_short_title if override_document_short_title else book.getShortTitle() +book_version = override_document_version if override_document_version else book.getVersion() or "001" +book_description = override_document_description if override_document_description else book.getDescription() +book_title = override_document_title if override_document_title else book.getTitle() if six.PY2 and isinstance(book_content, six.text_type): book_content = unicode2str(book_content) @@ -99,7 +98,7 @@ if override_batch_mode: book_revision = "1" book_short_date = book_modification_date.strftime('%Y-%m-%d') -if book_language: +if book_language and 'AcceptLanguage' in book.REQUEST: book.REQUEST['AcceptLanguage'].set(book_language, 10) else: book_language = blank