diff options
author | zottel <github@zottel.net> | 2012-03-27 13:20:59 +0200 |
---|---|---|
committer | zottel <github@zottel.net> | 2012-03-27 13:20:59 +0200 |
commit | fb817a29a934a68f194a42c29d3ed11da2da558f (patch) | |
tree | fdeb88be9d8545ead92c5d63a9d9af7f6a7ccc23 /library/mcefixes/plugins.bbcode.editor_plugin_src.js | |
parent | fabd4f4d2ebd9d1623db7e20d6e4e8f6bd0611ff (diff) | |
parent | 928e6c7ef78d251429a7d5c1fd4fdb8e6c282d41 (diff) | |
download | volse-hubzilla-fb817a29a934a68f194a42c29d3ed11da2da558f.tar.gz volse-hubzilla-fb817a29a934a68f194a42c29d3ed11da2da558f.tar.bz2 volse-hubzilla-fb817a29a934a68f194a42c29d3ed11da2da558f.zip |
Merge remote branch 'upstream/master'
Diffstat (limited to 'library/mcefixes/plugins.bbcode.editor_plugin_src.js')
-rwxr-xr-x | library/mcefixes/plugins.bbcode.editor_plugin_src.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/library/mcefixes/plugins.bbcode.editor_plugin_src.js b/library/mcefixes/plugins.bbcode.editor_plugin_src.js index 183f2bc68..a2829a21c 100755 --- a/library/mcefixes/plugins.bbcode.editor_plugin_src.js +++ b/library/mcefixes/plugins.bbcode.editor_plugin_src.js @@ -150,7 +150,7 @@ rep(/<blockquote[^>]*>/gi,"[quote]");
rep(/<\/blockquote>/gi,"[/quote]");
rep(/<hr \/>/gi,"[hr]");
- rep(/<br \/>/gi,"\n\n");
+ rep(/<br (.*?)\/>/gi,"\n\n");
rep(/<br\/>/gi,"\n\n");
rep(/<br>/gi,"\n");
rep(/<p>/gi,"");
|