Merge branch 'master' into es17.01

2017-04-11 11:56:37 +02:00
parent 5a81d9a736 1f6fce1278
commit 87113e2f6f
22 changed files with 269 additions and 109 deletions
--- a/modules/feed_aggregator/feed_aggregator_module.e
+++ b/modules/feed_aggregator/feed_aggregator_module.e
@@ -326,7 +326,7 @@ feature -- Hook

 	response_alter (a_response: CMS_RESPONSE)
 		do
-			a_response.add_style (a_response.url ("/module/" + name + "/files/css/feed_aggregator.css", Void), Void)
+			a_response.add_style (a_response.module_resource_url (Current, "/files/css/feed_aggregator.css", Void), Void)
 		end

 	menu_system_alter (a_menu_system: CMS_MENU_SYSTEM; a_response: CMS_RESPONSE)