From cd780e50e1d0ad2239a655fdee27af22b85b7963 Mon Sep 17 00:00:00 2001
From: Jaap Jansma <jaap.jansma@civicoop.org>
Date: Fri, 19 Nov 2021 16:31:05 +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 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/de.systopia.civiproxy/CRM/Civiproxy/Mailer.php b/de.systopia.civiproxy/CRM/Civiproxy/Mailer.php
index 90284a9..d3b9618 100644
--- a/de.systopia.civiproxy/CRM/Civiproxy/Mailer.php
+++ b/de.systopia.civiproxy/CRM/Civiproxy/Mailer.php
@@ -61,6 +61,7 @@ class CRM_Civiproxy_Mailer {
     $value = preg_replace("#{$system_base}sites/all/modules/civicrm/extern/open.php#i", $proxy_base.'/open.php',        $value);
     $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);
+    $value = preg_replace("#{$system_base}civicrm/mosaico/img/\?src=#i", $proxy_base.'/mosaico.php?id=', $value);
     if ($mosaico->isMosaicoInstalled()) {
       $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];