Feature 1502

Move mail images.
Change image path in mail-css files.
Remove local css file for NBM.

git-svn-id: http://piwigo.org/svn/trunk@5125 68402e56-0260-453c-a942-63ccdbb3a9ee

1 files changed, 1 insertions, 11 deletions

diff --git a/include/functions_mail.inc.php b/include/functions_mail.inc.php
index b55d55366..d340e9781 100644
--- a/include/functions_mail.inc.php
+++ b/include/functions_mail.inc.php
@@ -654,13 +654,11 @@ function pwg_mail($to, $args = array())
 
       if ($content_type == 'text/html')
       {
-        /*
-        if (is_file($conf_mail[$cache_key]['theme']->get_template_dir().'/global-mail-css.tpl'))
+        if ($conf_mail[$cache_key]['theme']->smarty->template_exists('global-mail-css.tpl'))
         {
           $conf_mail[$cache_key]['theme']->set_filename('css', 'global-mail-css.tpl');
           $conf_mail[$cache_key]['theme']->assign_var_from_handle('GLOBAL_MAIL_CSS', 'css');
         }
-        */
 
         $file = PHPWG_ROOT_PATH.'themes/'.$args['theme'].'/mail-css.tpl';
         if (is_file($file))
@@ -668,14 +666,6 @@ function pwg_mail($to, $args = array())
           $conf_mail[$cache_key]['theme']->set_filename('css', realpath($file));
           $conf_mail[$cache_key]['theme']->assign_var_from_handle('MAIL_CSS', 'css');
         }
-        /*
-        $file = $root_abs_path.'/template-common/local-mail-css.tpl';
-        if (is_file($file))
-        {
-          $conf_mail[$cache_key]['template']->set_filename('css', $file);
-          $conf_mail[$cache_key]['template']->assign_var_from_handle('LOCAL_MAIL_CSS', 'css');
-        }
-        */
       }
 
       // what are displayed on the header of each mail ?