From 6d6e9d8a434b6fcdfe75ebb074fbe875bb96d74c Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 5 Jun 2014 09:54:21 +0000 Subject: [PATCH] also replace p tags --- phpgwapi/js/jsapi/egw_message.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/phpgwapi/js/jsapi/egw_message.js b/phpgwapi/js/jsapi/egw_message.js index cb6197ff23..7942153268 100644 --- a/phpgwapi/js/jsapi/egw_message.js +++ b/phpgwapi/js/jsapi/egw_message.js @@ -29,6 +29,7 @@ egw.extend('message', egw.MODULE_WND_LOCAL, function(_app, _wnd) var error_reg_exp; var on_click_remove_installed = false; var a_href_reg = /([^<]+)<\/a>/img; + var new_line_reg = /<\/?(p|br)\s*\/?>\n?/ig; // Register an 'error' plugin, displaying using the message system this.registerJSONPlugin(function(type, res, req) { @@ -107,8 +108,8 @@ egw.extend('message', egw.MODULE_WND_LOCAL, function(_app, _wnd) }); on_click_remove_installed = true; } - // replace br-tags with newlines - _msg = _msg.replace(/\n?/i, "\n"); + // replace p and br-tags with newlines + _msg = _msg.replace(new_line_reg, "\n"); var msg_div = jQuery(_wnd.document.createElement('div')) .attr('id','egw_message')