bug 28: Moved function from temp_function1.php to includes/lib/l10n.php and changed...
authorINOPIAE <inopiae@cacert.org>
Sun, 16 Dec 2012 15:07:41 +0000 (16:07 +0100)
committerBenny Baumann <BenBE@geshi.org>
Wed, 1 May 2013 13:50:25 +0000 (15:50 +0200)
includes/account.php
includes/lib/l10n.php
includes/temp_function1.php [deleted file]
www/disputes.php
www/wot.php

index a89d620..f9df120 100644 (file)
@@ -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");
 
index 85b7aff..f834fd0 100644 (file)
@@ -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 (file)
index ce6854e..0000000
+++ /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'];
-
-}
-?>
index 2fa015d..f203b62 100644 (file)
@@ -17,7 +17,7 @@
 */ ?>
 <?
        require_once("../includes/loggedin.php");
-       require_once("../includes/temp-function1.php");
+       require_once("../includes/lib/l10n.php");
 
        loadem("account");
 
index c5a442c..3747a67 100644 (file)
@@ -18,7 +18,6 @@
 <?
 require_once("../includes/loggedin.php");
 require_once("../includes/lib/l10n.php");
-       require_once("../includes/temp-function1.php");
 
 function show_page($target,$message,$error)
 {