From 59b7544b0b39f5a2b64bf96f6170a621e4db44d2 Mon Sep 17 00:00:00 2001 From: Jaap Jansma Date: Fri, 19 Nov 2021 16:19:48 +0100 Subject: [PATCH] Fix for #38: added url encoding to mosaico template images, so that google+.png works --- de.systopia.civiproxy/CRM/Civiproxy/Mailer.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/de.systopia.civiproxy/CRM/Civiproxy/Mailer.php b/de.systopia.civiproxy/CRM/Civiproxy/Mailer.php index ce6e4ac..90284a9 100644 --- a/de.systopia.civiproxy/CRM/Civiproxy/Mailer.php +++ b/de.systopia.civiproxy/CRM/Civiproxy/Mailer.php @@ -62,7 +62,9 @@ class CRM_Civiproxy_Mailer { $value = preg_replace("#{$system_base}sites/default/files/civicrm/persist/#i", $proxy_base.'/file.php?id=', $value); $value = preg_replace("#{$system_base}civicrm/mosaico/img\?src=#i", $proxy_base.'/mosaico.php?id=', $value); if ($mosaico->isMosaicoInstalled()) { - $value = preg_replace("#({$mosaico->getMosaicoExtensionUrl()}/packages/mosaico/templates/)(\S*)([\"'])#i", $proxy_base . '/mosaico.php?template_url=$2$3', $value); + $value = preg_replace_callback("#({$mosaico->getMosaicoExtensionUrl()}/packages/mosaico/templates/)(\S*)([\"'])#i", function($matches) use ($proxy_base) { + return $proxy_base . '/mosaico.php?template_url=' . urlencode($matches[2]) . $matches[3]; + }, $value); } // Mailing related functions