From 5cb8db64cfdcbf06244f151b7202e6d7ab1ed7d6 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 7 Jan 2013 20:25:38 -0800
Subject: bypass smarty for intletext templates

---
 include/account.php | 10 ++++++++++
 include/items.php   |  7 +++++++
 2 files changed, 17 insertions(+)

(limited to 'include')

diff --git a/include/account.php b/include/account.php
index 9f967f2c3..329e0a67c 100644
--- a/include/account.php
+++ b/include/account.php
@@ -230,6 +230,8 @@ function send_reg_approval_email($arr) {
 		else
 			push_lang('en');
 
+		$engine = get_app()->get_template_engine();
+		getapp()->set_template_engine();
 
 		$email_msg = replace_macros(get_intltext_template('register_verify_email.tpl'), array(
 			'$sitename' => get_config('config','sitename'),
@@ -239,6 +241,8 @@ function send_reg_approval_email($arr) {
 			'$hash'     => $hash
 		 ));
 
+		getapp()->set_template_engine($engine);
+
 		$res = mail($admin['email'], sprintf( t('Registration request at %s'), get_config('config','sitename')),
 			$email_msg,
 			'From: ' . t('Administrator') . '@' . get_app()->get_hostname() . "\n"
@@ -256,6 +260,9 @@ function send_reg_approval_email($arr) {
 
 function send_verification_email($email,$password) {
 
+	$engine = get_app()->get_template_engine();
+	getapp()->set_template_engine();
+
 	$email_msg = replace_macros(get_intltext_template('register_open_eml.tpl'), array(
 		'$sitename' => get_config('config','sitename'),
 		'$siteurl' =>  z_root(),
@@ -263,6 +270,9 @@ function send_verification_email($email,$password) {
 		'$password' => $password,
 	));
 
+
+	getapp()->set_template_engine($engine);
+
 	$res = mail($email, sprintf( t('Registration details for %s'), get_config('system','sitename')),
 		$email_msg, 
 		'From: ' . t('Administrator') . '@' . get_app()->get_hostname() . "\n"
diff --git a/include/items.php b/include/items.php
index 66450b6fa..32826ef4c 100755
--- a/include/items.php
+++ b/include/items.php
@@ -3600,6 +3600,10 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) {
 			}
 
 			if(($r[0]['notify-flags'] & NOTIFY_INTRO) && ($r[0]['page-flags'] == PAGE_NORMAL)) {
+
+				$engine = get_app()->get_template_engine();
+				get_app()->set_template_engine();
+
 				$email_tpl = get_intltext_template('follow_notify_eml.tpl');
 				$email = replace_macros($email_tpl, array(
 					'$requestor' => ((strlen($name)) ? $name : t('[Name Withheld]')),
@@ -3608,6 +3612,9 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) {
 					'$siteurl' => $a->get_baseurl(),
 					'$sitename' => $a->config['sitename']
 				));
+
+				get_app()->set_template_engine($engine);
+
 				$res = mail($r[0]['email'], 
 					(($sharing) ? t('A new person is sharing with you at ') : t("You have a new follower at ")) . $a->config['sitename'],
 					$email,
-- 
cgit v1.2.3