make ANY_CMS_EXECUTION more flexible

This commit is contained in:
Jocelyn Fiat
2013-02-04 16:47:29 +01:00
parent 7db054a36d
commit 451aa7773d

View File

@@ -36,8 +36,10 @@ feature -- Execution
b: STRING_8 b: STRING_8
s: STRING s: STRING
do do
create b.make_empty if attached main_content as m then
if attached text as t then -- ok
elseif attached text as t then
create b.make_empty
s := request.path_info s := request.path_info
if attached service.base_url as l_base_url then if attached service.base_url as l_base_url then
if s.starts_with (l_base_url) then if s.starts_with (l_base_url) then
@@ -49,10 +51,11 @@ feature -- Execution
end end
set_title (s) set_title (s)
b.append (t) b.append (t)
set_main_content (b)
else else
set_title ("Page Not Found") set_title ("...")
set_main_content ("")
end end
set_main_content (b)
end end
end end