diff options
| author | Alexander Kampmann <programmer@nurfuerspam.de> | 2012-04-05 13:39:15 +0200 |
|---|---|---|
| committer | Alexander Kampmann <programmer@nurfuerspam.de> | 2012-04-05 13:39:15 +0200 |
| commit | 355c42cb309eb1313097411067ca999b699aa620 (patch) | |
| tree | d00d1af9dceecdf114cadff924c5ba4a864fbf43 /library/mcefixes | |
| parent | cbf4544887c7f496f2b2312727fe7bcb64a6d6c8 (diff) | |
| parent | 9b6e91086b29554fd04362f6c87ea148718e8b1c (diff) | |
| download | volse-hubzilla-355c42cb309eb1313097411067ca999b699aa620.tar.gz volse-hubzilla-355c42cb309eb1313097411067ca999b699aa620.tar.bz2 volse-hubzilla-355c42cb309eb1313097411067ca999b699aa620.zip | |
Merge branch 'master' of https://github.com/friendica/friendica
Conflicts:
include/config.php
update.php
Diffstat (limited to 'library/mcefixes')
| -rw-r--r-- | library/mcefixes/README | 6 | ||||
| -rw-r--r--[-rwxr-xr-x] | library/mcefixes/plugins.bbcode.editor_plugin_src.js | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | library/mcefixes/themes.advanced.img.icons.gif | bin | 11776 -> 11776 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | library/mcefixes/themes.advanced.skins.default.dialog.css | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | library/mcefixes/themes.advanced.skins.default.ui.css | 0 |
5 files changed, 6 insertions, 2 deletions
diff --git a/library/mcefixes/README b/library/mcefixes/README index dca70e1c3..578163a9d 100644 --- a/library/mcefixes/README +++ b/library/mcefixes/README @@ -1,4 +1,8 @@ In order to make TinyMCE work smoothly with Friendica, the files in this directory are those few files we've changed in TinyMCE. We will attempt to keep them current, but if you decide to upgrade tinymce, it is best to save current copies of the files in question from the active tinymce tree and replace them or merge them after upgrade. Except for some simple theming, the primary changes are the advanced theme icon set, which we changed the "html" icon to "[]" to represent BBcode, and major changes have been made to the bbcode plugin. -
\ No newline at end of file + + +in TinyMCE 3.5b2 it appears that we are getting double linefeeds. Code has been put in place in mod/item.php and mod/message.php to reduce the duplicates. + + diff --git a/library/mcefixes/plugins.bbcode.editor_plugin_src.js b/library/mcefixes/plugins.bbcode.editor_plugin_src.js index 183f2bc68..a2829a21c 100755..100644 --- 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/mcefixes/themes.advanced.img.icons.gif b/library/mcefixes/themes.advanced.img.icons.gif Binary files differindex efb356c41..efb356c41 100755..100644 --- a/library/mcefixes/themes.advanced.img.icons.gif +++ b/library/mcefixes/themes.advanced.img.icons.gif diff --git a/library/mcefixes/themes.advanced.skins.default.dialog.css b/library/mcefixes/themes.advanced.skins.default.dialog.css index f01222650..f01222650 100755..100644 --- a/library/mcefixes/themes.advanced.skins.default.dialog.css +++ b/library/mcefixes/themes.advanced.skins.default.dialog.css diff --git a/library/mcefixes/themes.advanced.skins.default.ui.css b/library/mcefixes/themes.advanced.skins.default.ui.css index 5f1f96448..5f1f96448 100755..100644 --- a/library/mcefixes/themes.advanced.skins.default.ui.css +++ b/library/mcefixes/themes.advanced.skins.default.ui.css |
