From b240b8489aa34d3016ffb11c8a2176eca41c5e5a Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 26 Mar 2012 01:43:26 -0700
Subject: [PATCH] language issues in enotify

---
 include/enotify.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/include/enotify.php b/include/enotify.php
index 1918f26df3..8385bdec59 100755
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -5,6 +5,12 @@ function notification($params) {
 	logger('notification: entry', LOGGER_DEBUG);
 
 	$a = get_app();
+
+	// from here on everything is in the recipients language
+
+	push_lang($params['language']);
+
+
 	$banner = t('Friendica Notification');
 	$product = FRIENDICA_PLATFORM;
 	$siteurl = z_path();
@@ -180,9 +186,6 @@ function notification($params) {
 	$hsitelink = $h['hsitelink'];
 	$itemlink  = $h['itemlink']; 
 
-	// from here on everything is in the recipients language
-
-	push_lang($params['language']);
 
 	require_once('include/html2bbcode.php');	
 
@@ -234,8 +237,10 @@ function notification($params) {
 	);
 	if($r)
 		$notify_id = $r[0]['id'];
-	else
+	else {
+		pop_lang();
 		return;
+	}
 
 	$itemlink = $a->get_baseurl() . '/notify/view/' . $notify_id;
 	$msg = replace_macros($epreamble,array('$itemlink' => $itemlink));
@@ -246,7 +251,6 @@ function notification($params) {
 	);
 		
 
-
 	// send email notification if notification preferences permit
 
 	require_once('bbcode.php');