bug 28: Moved function from temp_function1.php to includes/lib/l10n.php and changed the reference

3 files changed, 8 insertions, 15 deletions

diff --git a/includes/account.php b/includes/account.php
index a89d620..f9df120 100644
--- a/includes/account.php
+++ b/includes/account.php
@@ -18,7 +18,6 @@
 	require_once("../includes/loggedin.php");
 	require_once("../includes/lib/l10n.php");
 	require_once('lib/check_weak_key.php');
-	require_once("../includes/temp-function1.php");
 
 	loadem("account");
 
diff --git a/includes/lib/l10n.php b/includes/lib/l10n.php
index 85b7aff..f834fd0 100644
--- a/includes/lib/l10n.php
+++ b/includes/lib/l10n.php
@@ -340,4 +340,12 @@ class L10n {
 		bindtextdomain($domain, $_SESSION['_config']['filepath'].'/locale');
 		textdomain($domain);
 	}
+
+	function get_recipient_language($accoundid){
+//returns the language of a recipient to make sure that the language is correct
+//use together with
+	$query = "select * from `users` where `id`='".$id:"'";
+	$res = mysql_query($query);
+	$row = mysql_fetch_assoc($res);
+	return $row['language'];
 }
\ No newline at end of file
diff --git a/includes/temp_function1.php b/includes/temp_function1.php
deleted file mode 100644
index ce6854e..0000000
--- a/includes/temp_function1.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-function get_recipient_language($accoundid){
-//returns the language of a recipient to make sure that the language is correct
-//use together with
-// $my_translation = L10n::get_translation();
-// L10n::set_translation($_SESSION['_config']['notarise']['language']);
-// L10n::set_translation($my_translation);
-	$query = "select * from `users` where `id`='".$id:"'";
-	$res = mysql_query($query);
-	$row = mysql_fetch_assoc($res);
-	return $row['language'];
-
-}
-?>