Merge branch 'bug-28' into release

Conflicts:
	includes/account.php
	scripts/cron/warning.php
	www/disputes.php
	www/wot.php

1 files changed, 18 insertions, 1 deletions

diff --git a/includes/lib/l10n.php b/includes/lib/l10n.php
index e325add..4859946 100644
--- a/includes/lib/l10n.php
+++ b/includes/lib/l10n.php
@@ -355,4 +355,21 @@ class L10n {
 		bindtextdomain($domain, $_SESSION['_config']['filepath'].'/locale');
 		textdomain($domain);
 	}
-}
\ No newline at end of file
+
+	public static function set_recipient_language($accountid) {
+		//returns the language of a recipient to make sure that the language is correct
+		//use together with
+		$query = "select `language` from `users` where `id`='".intval($accountid)."'";
+		$res = mysql_query($query);
+		if (mysql_num_rows($res)>=0) {
+			$row = mysql_fetch_assoc($res);
+			if (NULL==$row['language'] || $row['language']=='') {
+				self::set_translation('en');
+			} else {
+				self::set_translation($row['language']);
+			}
+		} else {
+			self::set_translation('en');
+		}
+	}
+}