[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[41913] branches/9.x/tiki-webmail_ajax.php

[<ar...@us...>]

Revision: 41913
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=41913&view=rev
Author:   arildb
Date:     2012-06-11 23:21:56 +0000 (Mon, 11 Jun 2012)
Log Message:
-----------
[FIX] Use default_mail_charset instead of hard-coding UTF-8 (in r41912)

Revision Links:
--------------
    http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=41912&view=rev

Modified Paths:
--------------
    branches/9.x/tiki-webmail_ajax.php

Modified: branches/9.x/tiki-webmail_ajax.php
===================================================================
--- branches/9.x/tiki-webmail_ajax.php	2012-06-11 21:38:21 UTC (rev 41912)
+++ branches/9.x/tiki-webmail_ajax.php	2012-06-11 23:21:56 UTC (rev 41913)
@@ -206,6 +206,11 @@
 		$objResponse->script('doRefreshWebmail();alert("Sorry, that mail has been taken by another operator. Refreshing list...");');
 		
 	} else {
+		$charset = $prefs['default_mail_charset'];
+		if(empty($charset)) {
+			$charset = 'UTF-8';
+		}
+		
 		$items['data'][0]['fieldId'] = $module_params['fromFId'];
 		$items['data'][0]['type'] = 't';
 		$items['data'][0]['value'] = $from;
@@ -220,7 +225,7 @@
 		$items['data'][3]['value'] = $realmsgid;
 		$items['data'][4]['fieldId'] = $module_params['contentFId'];
 		$items['data'][4]['type'] = 'a';
-		$items['data'][4]['value'] = htmlentities($cont['body'], ENT_QUOTES, 'UTF-8');
+		$items['data'][4]['value'] = htmlentities($cont['body'], ENT_QUOTES, $charset);
 		$items['data'][5]['fieldId'] = $module_params['accountFId'];
 		$items['data'][5]['type'] = 't';
 		$items['data'][5]['value'] = $acc['account'];

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.