Merge pull request #1344 from jloguercio/1.10.x

Fix missing custom logo in platform mails - Refs BT#11486

main/inc/lib/template.lib.php

@@ -114,6 +114,7 @@ class Template
         $this->twig->addFilter('get_path', new Twig_Filter_Function('api_get_path'));
         $this->twig->addFilter('get_setting', new Twig_Filter_Function('api_get_setting'));
         $this->twig->addFilter('var_dump', new Twig_Filter_Function('var_dump'));
+        $this->twig->addFilter('return_logo', new Twig_Filter_Function('return_logo'));
         $this->twig->addFilter('return_message', new Twig_Filter_Function('Display::return_message_and_translate'));
         $this->twig->addFilter('display_page_header', new Twig_Filter_Function('Display::page_header_and_translate'));
         $this->twig->addFilter(
@@ -209,6 +210,7 @@ class Template
     {
         return Display::return_icon($image, $name, array(), $size);
     }
+
     /**
      * @param string $timestamp
      * @param string $format

main/template/default/mail/header.tpl

@@ -1,9 +1,7 @@
 <table border="0" cellpadding="10" cellspacing="0" width="100%">
     <tr>
         <td width="245">
-            <a href="{{ _p.web }}">
-                <img src="{{ _p.web_css_theme ~ 'images/header-logo.png' }}" alt="{{ _s.site_name }}">
-            </a>
+            {{ css_styles | return_logo }}
         </td>
         <td width="100%">
             &nbsp;