Version 4.6.0
This commit is contained in:
1 parent
f79dcf067a
commit
517a5e1f70
2036 files changed
+110041
-26162
No files matched your search
@@ -672,8 +672,8 @@ class _Email
|
||||
{
|
||||
/* Because we have already parsed the body we have to swap these back otherwise HTMLPurifier will think they're invalid
|
||||
HTML. The reparsing we do below will put them back automatically. */
|
||||
$body = str_replace( '<___base_url___>', '{___base_url___}', $body );
|
||||
$quote = str_replace( '<___base_url___>', '{___base_url___}', $quote );
|
||||
$body = str_replace( '<___base_url___>', rtrim( \IPS\Settings::i()->base_url, '/' ), $body );
|
||||
$quote = str_replace( '<___base_url___>', rtrim( \IPS\Settings::i()->base_url, '/' ), $quote );
|
||||
|
||||
/* Parse */
|
||||
$body = \IPS\Text\Parser::parseStatic( $body, FALSE, NULL, \IPS\Member::load( $this->from, 'email' ) );
|
||||
@@ -789,7 +789,7 @@ class _Email
|
||||
{
|
||||
if ( \IPS\Email::hasTemplate( 'core', 'unrouted' ) )
|
||||
{
|
||||
\IPS\Email::buildFromTemplate( 'core', 'unrouted', $this )->send( $this->from );
|
||||
\IPS\Email::buildFromTemplate( 'core', 'unrouted', $this, \IPS\Email::TYPE_TRANSACTIONAL )->send( $this->from );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user