Merge pull request #12906 from annando/issue-12870

Issue 12870: Support for zmg elements from Hubzilla
This commit is contained in:
Hypolite Petovan 2023-03-18 07:22:28 -04:00 committed by GitHub
commit cd8b2fe24e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1562,7 +1562,7 @@ class BBCode
$text = preg_replace("/\[zmg\=([0-9]*)x([0-9]*)\](.*?)\[\/zmg\]/ism", '<img class="zrl" src="$3" style="width: $1px;" >', $text);
$text = preg_replace_callback(
"/\[img\=(.*?)\](.*?)\[\/img\]/ism",
"/\[[iz]mg\=(.*?)\](.*?)\[\/[iz]mg\]/ism",
function ($matches) use ($simple_html, $uriid) {
$matches[1] = self::proxyUrl($matches[1], $simple_html, $uriid);
$matches[2] = htmlspecialchars($matches[2], ENT_COMPAT);
@ -1574,7 +1574,7 @@ class BBCode
// Images
// [img]pathtoimage[/img]
$text = preg_replace_callback(
"/\[img\](.*?)\[\/img\]/ism",
"/\[[iz]mg\](.*?)\[\/[iz]mg\]/ism",
function ($matches) use ($simple_html, $uriid) {
if (strpos($matches[1], "data:image/") === 0) {
return $matches[0];