From 5b0ab7643472a09f680f675f6b2887836d7bc2b3 Mon Sep 17 00:00:00 2001 From: Jocelyn Fiat Date: Tue, 20 Oct 2015 19:02:04 +0200 Subject: [PATCH] Fixed more unicode issues, or being more flexible when loading from database. --- modules/blog/handler/blog_handler.e | 4 ++-- src/persistence/sql/cms_storage_sql_i.e | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/blog/handler/blog_handler.e b/modules/blog/handler/blog_handler.e index de30e17..c9038b0 100644 --- a/modules/blog/handler/blog_handler.e +++ b/modules/blog/handler/blog_handler.e @@ -230,9 +230,9 @@ feature -- HTML Output lnk := blog_api.node_api.node_link (n) a_output.append ("

") if attached api.format (n.format) as f then - a_output.append (f.formatted_output (l_summary)) + f.append_formatted_to (l_summary, a_output) else - a_output.append (page.formats.default_format.formatted_output (l_summary)) + page.formats.default_format.append_formatted_to (l_summary, a_output) end a_output.append ("
") a_output.append (page.link ("See more...", lnk.location, Void)) diff --git a/src/persistence/sql/cms_storage_sql_i.e b/src/persistence/sql/cms_storage_sql_i.e index 8798e22..4ddb2f3 100644 --- a/src/persistence/sql/cms_storage_sql_i.e +++ b/src/persistence/sql/cms_storage_sql_i.e @@ -302,6 +302,11 @@ feature -- Access l_item := sql_item (a_index) if attached {READABLE_STRING_8} l_item as l_string then Result := l_string + elseif + attached {READABLE_STRING_32} l_item as l_string_32 and then + l_string_32.is_valid_as_string_8 + then + Result := l_string_32.to_string_8 elseif attached {BOOLEAN} l_item as l_boolean then Result := l_boolean.out elseif attached {BOOLEAN_REF} l_item as l_boolean_ref then