Merge pull request #512 from francescbassas/patch-1

Define customTemplatesUrl absolute as templatesUrl
veda-consulting-company · May 22, 2022 · 4c8248b · 4c8248b
2 parents 640ad12 + 8e5d9c5
commit 4c8248b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/CRM/Mosaico/BAO/MosaicoTemplate.php b/CRM/Mosaico/BAO/MosaicoTemplate.php
@@ -64,8 +64,8 @@ public static function findBaseTemplates($ignoreCache = FALSE, $dispatchHooks =
 
       $templatesLocation[] = ['dir' => $templatesDir, 'url' => $templatesUrl];
 
-      $customTemplatesDir = \Civi::paths()->getPath(CRM_Core_BAO_Setting::getItem('Mosaico Preferences', 'mosaico_custom_templates_dir'));
-      $customTemplatesUrl = \Civi::paths()->getUrl(CRM_Core_BAO_Setting::getItem('Mosaico Preferences', 'mosaico_custom_templates_url'));
+      $customTemplatesDir = \Civi::paths()->getPath(\Civi::settings()->get('mosaico_custom_templates_dir'));
+      $customTemplatesUrl = \Civi::paths()->getUrl(\Civi::settings()->get('mosaico_custom_templates_url'),'absolute');
       if (!is_null($customTemplatesDir) && !is_null($customTemplatesUrl)) {
         if (is_dir($customTemplatesDir)) {
           $templatesLocation[] = ['dir' => $customTemplatesDir, 'url' => $customTemplatesUrl];