From 451aa7773df5dd68cc2ca54a22ce5dd6fe8e6fd3 Mon Sep 17 00:00:00 2001 From: Jocelyn Fiat Date: Mon, 4 Feb 2013 16:47:29 +0100 Subject: [PATCH] make ANY_CMS_EXECUTION more flexible --- draft/application/cms/src/handler/any_cms_execution.e | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/draft/application/cms/src/handler/any_cms_execution.e b/draft/application/cms/src/handler/any_cms_execution.e index 18be1303..ce110991 100644 --- a/draft/application/cms/src/handler/any_cms_execution.e +++ b/draft/application/cms/src/handler/any_cms_execution.e @@ -36,8 +36,10 @@ feature -- Execution b: STRING_8 s: STRING do - create b.make_empty - if attached text as t then + if attached main_content as m then + -- ok + elseif attached text as t then + create b.make_empty s := request.path_info if attached service.base_url as l_base_url then if s.starts_with (l_base_url) then @@ -49,10 +51,11 @@ feature -- Execution end set_title (s) b.append (t) + set_main_content (b) else - set_title ("Page Not Found") + set_title ("...") + set_main_content ("") end - set_main_content (b) end end