Merge pull request #12162 from annando/link-share
Avoid link parsing problems in front of "share" elements
This commit is contained in:
commit
07d42d6af2
|
@ -1588,8 +1588,8 @@ class BBCode
|
||||||
$text = str_replace(">", ">", $text);
|
$text = str_replace(">", ">", $text);
|
||||||
|
|
||||||
// remove some newlines before the general conversion
|
// remove some newlines before the general conversion
|
||||||
$text = preg_replace("/\s?\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism", "[share$1]$2[/share]", $text);
|
$text = preg_replace("/\s?\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism", "\n[share$1]$2[/share]\n", $text);
|
||||||
$text = preg_replace("/\s?\[quote(.*?)\]\s?(.*?)\s?\[\/quote\]\s?/ism", "[quote$1]$2[/quote]", $text);
|
$text = preg_replace("/\s?\[quote(.*?)\]\s?(.*?)\s?\[\/quote\]\s?/ism", "\n[quote$1]$2[/quote]\n", $text);
|
||||||
|
|
||||||
// when the content is meant exporting to other systems then remove the avatar picture since this doesn't really look good on these systems
|
// when the content is meant exporting to other systems then remove the avatar picture since this doesn't really look good on these systems
|
||||||
if (!$try_oembed) {
|
if (!$try_oembed) {
|
||||||
|
|
Loading…
Reference in a new issue