Skip to content

Commit b814c91

Browse files
committed
Updated obsolete message with expected timestamp.
Removed a few obsolete calls or implicit conversions.
1 parent 1aad62e commit b814c91

File tree

9 files changed

+28
-20
lines changed

9 files changed

+28
-20
lines changed

src/configuration/cms_default_setup.e

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ feature -- Access
104104
do
105105
if not retried then
106106
if attached text_item ("mailer.smtp") as l_smtp then
107-
create {NOTIFICATION_SMTP_MAILER} l_mailer.make (l_smtp)
107+
create {NOTIFICATION_SMTP_MAILER} l_mailer.make (l_smtp.as_string_8_conversion)
108108
elseif attached text_item ("mailer.sendmail") as l_sendmail then
109109
create {NOTIFICATION_SENDMAIL_MAILER} l_mailer.make_with_location (l_sendmail)
110110
end

src/configuration/cms_setup.e

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ feature {NONE} -- Initialization
1717
local
1818
l_url: like site_url
1919
s, l_email: detachable READABLE_STRING_8
20+
utf: UTF_CONVERTER
2021
do
2122
site_location := environment.path
2223

@@ -49,7 +50,7 @@ feature {NONE} -- Initialization
4950
l_email := string_8_item_or_default ("mailer.from", "webmaster")
5051
end
5152
if l_email.has ('<') then
52-
l_email := site_name + " <" + l_email + ">"
53+
l_email := utf.string_32_to_utf_8_string_8 (site_name) + " <" + l_email + ">"
5354
end
5455
site_email := l_email
5556

@@ -125,7 +126,7 @@ feature -- Access
125126

126127
layout: CMS_ENVIRONMENT
127128
-- CMS environment.
128-
obsolete "use `environment' [april-2015]"
129+
obsolete "use `environment' [2017-05-31]"
129130
do
130131
Result := environment
131132
end

src/hooks/cms_hook_block_helper.e

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ feature {NONE} -- Factory: obsolete
4545
template_block (a_module: CMS_MODULE; a_block_id: READABLE_STRING_8; a_response: CMS_RESPONSE): detachable CMS_SMARTY_TEMPLATE_BLOCK
4646
-- Smarty content block for `a_block_id' in the context of `a_module' and `a_response'.
4747
obsolete
48-
"Use smarty_template_block [Feb/2016]"
48+
"Use smarty_template_block [2017-05-31]"
4949
do
5050
Result := smarty_template_block (a_module, a_block_id, a_response.api)
5151
end
@@ -54,12 +54,12 @@ feature {NONE} -- Factory: obsolete
5454
-- Smarty content block for `a_block_id' in the context of `a_module' and `a_response',
5555
-- With additional `a_values'.
5656
obsolete
57-
"Use smarty_template_block_with_values [Feb/2016]"
57+
"Use smarty_template_block_with_values [2017-05-31]"
5858
do
5959
Result := smarty_template_block_with_values (a_module, a_block_id, a_response.api, a_values)
6060
end
6161

6262
note
63-
copyright: "2011-2016, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
63+
copyright: "2011-2017, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
6464
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
6565
end

src/kernel/content/cms_file_block.e

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,13 +143,15 @@ feature -- Conversion
143143
feature -- Debug
144144

145145
out: STRING
146+
local
147+
utf: UTF_CONVERTER
146148
do
147149
create Result.make_from_string (generator)
148150
Result.append ("%Nname:")
149151
Result.append (name)
150152
if attached title as l_title then
151153
Result.append ("%N%Ttitle:")
152-
Result.append (l_title)
154+
Result.append (utf.string_32_to_utf_8_string_8 (l_title))
153155
end
154156
Result.append ("%Nlocation:")
155157
Result.append (location.out)
@@ -160,6 +162,6 @@ feature -- Debug
160162
Result.append ("%N")
161163
end
162164
note
163-
copyright: "2011-2015, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
165+
copyright: "2011-2017, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
164166
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
165167
end

src/kernel/content/cms_smarty_template_block.e

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,13 +161,15 @@ feature -- Conversion
161161
feature -- Debug
162162

163163
out: STRING
164+
local
165+
utf: UTF_CONVERTER
164166
do
165167
create Result.make_from_string (generator)
166168
Result.append ("%Nname:")
167169
Result.append (name)
168170
if attached title as l_title then
169171
Result.append ("%N%Ttitle:")
170-
Result.append (l_title)
172+
Result.append (utf.string_32_to_utf_8_string_8 (l_title))
171173
end
172174
Result.append ("%Nlocation:")
173175
Result.append (location.out)
@@ -190,6 +192,6 @@ feature -- Debug
190192
Result.append ("%N}")
191193
end
192194
note
193-
copyright: "2011-2016, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
195+
copyright: "2011-2017, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
194196
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
195197
end

src/kernel/link/cms_menu_system.e

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ feature -- Access
4646

4747
main_menu: CMS_MENU
4848
obsolete
49-
"Use `primary_menu' [Nov/2014]"
49+
"Use `primary_menu' [2017-05-31]"
5050
do
5151
Result := primary_menu
5252
end
@@ -101,4 +101,7 @@ feature {NONE} -- Implementation
101101

102102
items: STRING_TABLE [CMS_MENU]
103103

104+
;note
105+
copyright: "2011-2017, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
106+
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
104107
end

src/service/cms_api.e

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ feature {CMS_API_ACCESS} -- CMS Formats management
280280
if not s.is_empty then
281281
s.append ("+")
282282
end
283-
s.append (f_ic.item.name)
283+
s.append_string_general (f_ic.item.name)
284284
end
285285
ji.put_string (s, "filters")
286286

@@ -293,7 +293,7 @@ feature {CMS_API_ACCESS} -- CMS Formats management
293293
if not s.is_empty then
294294
s.append ("+")
295295
end
296-
s.append (ct.name)
296+
s.append_string_general (ct.name)
297297
end
298298
end
299299
ji.put_string (s, "types")
@@ -1172,7 +1172,7 @@ feature -- Theming path helpers
11721172
do
11731173
Result := setup.theme_location_for (a_theme_name)
11741174
end
1175-
1175+
11761176
theme_path_for (a_theme_name: READABLE_STRING_GENERAL): STRING_8
11771177
-- URL path to the theme `a_theme_name`.
11781178
do

src/service/response/cms_response.e

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ feature -- Menu
399399

400400
main_menu: CMS_MENU
401401
obsolete
402-
"Use `primary_menu' [Nov/2014]"
402+
"Use `primary_menu' [2017-05-31]"
403403
do
404404
Result := primary_menu
405405
end
@@ -460,7 +460,7 @@ feature -- Blocks initialization
460460
block_region_preference (a_block_id: READABLE_STRING_8; a_default_region: READABLE_STRING_8): READABLE_STRING_8
461461
-- Region associated with `a_block_id' in configuration, if any.
462462
do
463-
Result := setup.text_item_or_default ("blocks." + a_block_id + ".region", a_default_region)
463+
Result := setup.text_item_or_default ("blocks." + a_block_id + ".region", a_default_region).as_string_8_conversion
464464
end
465465

466466
feature -- Block management
@@ -909,7 +909,7 @@ feature -- Hooks
909909
hooks: CMS_HOOK_CORE_MANAGER
910910
-- Manager handling hook subscriptions.
911911
obsolete
912-
"Use api.hooks [dec/2015]"
912+
"Use api.hooks [2017-05-31]"
913913
do
914914
Result := api.hooks
915915
end
@@ -918,7 +918,7 @@ feature -- Menu: change
918918

919919
add_to_main_menu (lnk: CMS_LINK)
920920
obsolete
921-
"use add_to_primary_menu [Nov/2014]"
921+
"use add_to_primary_menu [2017-05-31]"
922922
do
923923
add_to_primary_menu (lnk)
924924
end

src/theme/smarty_theme/smarty_cms_theme.e

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,11 @@ feature -- Conversion
9494
l_table_inspector: detachable STRING_TABLE_OF_STRING_INSPECTOR
9595
do
9696
prepare (page)
97-
create l_page_inspector.register (page.generating_type)
97+
create l_page_inspector.register (page.generating_type.name)
9898

9999
if attached {CMS_RESPONSE} page.variables.item ("cms") as l_cms then
100100
if attached l_cms.regions as l_regions then
101-
create l_regions_inspector.register (l_regions.generating_type)
101+
create l_regions_inspector.register (l_regions.generating_type.name)
102102
end
103103
end
104104

0 commit comments

Comments
 (0)