clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/friendica/friendica

Browse Source 
Conflicts:
	include/config.php
	update.php
This commit is contained in:
Alexander Kampmann
2012-04-05 13:39:15 +02:00
parent cbf4544887 9b6e91086b
commit 355c42cb30
1809 changed files with 48790 additions and 7152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
library/mcefixes/plugins.bbcode.editor_plugin_src.js
Executable → Regular
+1 -1
View File
@@ -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,"");