Download as
Browse Code »

Commit 6c4293c4f6fdb44a8ffb34c57a1372e2d5db129e

Authored by Rodrigo Souto
2 parents 53e21f85 d46b83c6
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

Merge commit 'refs/merge-requests/325' of git://gitorious.org/noosfero/noosfero … 

…into merge-requests/325
Showing 1 changed file with 1 additions and 0 deletions   Show diff stats
public/javascripts/chat.js
  Diff comments   View file @6c4293c
@@ -99,6 +99,7 @@ jQuery(function($) { @@ -99,6 +99,7 @@ jQuery(function($) {
99 }, 99 },
100 100
101 render_body_message: function(body) { 101 render_body_message: function(body) {
  102 + body = body.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/\r?\n/g, '<br>');
102 body = $().emoticon(body); 103 body = $().emoticon(body);
103 body = linkify(body, { 104 body = linkify(body, {
104 callback: function(text, href) { 105 callback: function(text, href) {