aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-03-26 16:56:44 -0700
committerfriendica <info@friendica.com>2012-03-26 16:56:44 -0700
commit03b95c9a091920d0796f7835afc762d09971ab32 (patch)
treef1ae32b242727a080da2d1f9a8d8a071d6639241
parent70cc2fff6f6dfc2dc0b8aef195df84d7385bb9df (diff)
downloadvolse-hubzilla-03b95c9a091920d0796f7835afc762d09971ab32.tar.gz
volse-hubzilla-03b95c9a091920d0796f7835afc762d09971ab32.tar.bz2
volse-hubzilla-03b95c9a091920d0796f7835afc762d09971ab32.zip
translate br with extra elements
-rwxr-xr-xlibrary/mcefixes/plugins.bbcode.editor_plugin_src.js2
-rw-r--r--library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js2
2 files changed, 2 insertions, 2 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,"");
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js
index 183f2bc68..a2829a21c 100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js
+++ b/library/tinymce/jscripts/tiny_mce/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,"");