diff --git a/e107_core/templates/email_template.php b/e107_core/templates/email_template.php
index 9f9562d9b..67a563fa4 100644
--- a/e107_core/templates/email_template.php
+++ b/e107_core/templates/email_template.php
@@ -173,6 +173,7 @@ $EMAIL_TEMPLATE['default']['header'] = "
diff --git a/e107_handlers/e_parse_class.php b/e107_handlers/e_parse_class.php
index ae7f560b4..ec550be34 100644
--- a/e107_handlers/e_parse_class.php
+++ b/e107_handlers/e_parse_class.php
@@ -2961,7 +2961,8 @@ class e_parser
e107::getFile()->getRemoteFile($thumbSrc, $filename,'media');
}
- return "![Youtube Video](".$filepath." "Click to view on Youtube")
";
+ return "
+ Click to watch video
";
}
if($thumb == 'src')
diff --git a/e107_handlers/mail.php b/e107_handlers/mail.php
index 2f76952ee..8ef05ee67 100644
--- a/e107_handlers/mail.php
+++ b/e107_handlers/mail.php
@@ -638,11 +638,11 @@ class e107Email extends PHPMailer
if($tp->isVideo($val['path']))
{
- $eml['shortcodes'][$id] = "".$tp->toVideo($val['path'],array('thumb'=>'email'))."
";
+ $eml['shortcodes'][$id] = "".$tp->toVideo($val['path'],array('thumb'=>'email'))."
";
}
else
{
- $eml['shortcodes'][$id] = "";
+ $eml['shortcodes'][$id] = "";
}
}
diff --git a/e107_handlers/mail_manager_class.php b/e107_handlers/mail_manager_class.php
index 35009ec34..f8e81b3de 100644
--- a/e107_handlers/mail_manager_class.php
+++ b/e107_handlers/mail_manager_class.php
@@ -848,31 +848,40 @@ class e107MailManager
$temp = intval($email['mail_recipient_id']).'/'.intval($email['mail_source_id']).'/'.intval($email['mail_target_id']).'/';
$result['e107_header'] = $temp.md5($temp); // Set up an ID
}
+
if (isset($email['mail_attach']) && (trim($email['mail_attach']) || is_array($email['mail_attach'])))
{
- $downDir = realpath(e_ROOT.$this->e107->getFolder('downloads'));
+ $tp = e107::getParser();
+
if (is_array($email['mail_attach']))
{
foreach ($email['mail_attach'] as $k => $v)
{
- $result['email_attach'][$k] = $downDir.$v;
+ $result['email_attach'][$k] = $tp->replaceConstants($v);
}
}
else
{
- $result['email_attach'] = $downDir.trim($email['mail_attach']);
+ $result['email_attach'] = $tp->replaceConstants(trim($email['mail_attach']));
}
}
- if (isset($email['mail_overrides']) && is_array($email['mail_overrides'])) $result = array_merge($result, $email['mail_overrides']);
- e107::getAdminLog()->addDebug(print_a($email,true),true);
+ if (isset($email['mail_overrides']) && is_array($email['mail_overrides']))
+ {
+ $result = array_merge($result, $email['mail_overrides']);
+ }
- print_a($email);
+ $title = "".__METHOD__." Line: ".__LINE__."
";
+ e107::getAdminLog()->addDebug($title.print_a($email,true),true);
- // $result['template'] = $email['mail_send_style'];
-
- echo "".__METHOD__." Line: ".__LINE__."
";
- print_a($result);
+ if(!empty($email['mail_media']))
+ {
+ $result['media'] = $email['mail_media'];
+ }
+
+ $title2 = "".__METHOD__." Line: ".__LINE__."
";
+ e107::getAdminLog()->addDebug($title2.print_a($result,true),true);
+
return $result;
}