Merge branch 'MDL-19270_master' of https://github.com/nadavkav/moodle

This commit is contained in:
Sam Hemelryk 2014-07-08 13:53:40 +12:00
commit d320391099
2 changed files with 14 additions and 1 deletions

View File

@ -378,6 +378,18 @@ class core_text {
}
}
/**
* Reverse UTF-8 multibytes character sets (used for RTL languages)
* (We only do this because there is no mb_strrev or iconv_strrev)
*
* @param string $str the multibyte string to reverse
* @return string the reversed multi byte string
*/
public static function strrev($str) {
preg_match_all('/./us', $str, $ar);
return join('', array_reverse($ar[0]));
}
/**
* Try to convert upper unicode characters to plain ascii,
* the returned string may contain unconverted unicode characters.

View File

@ -1193,7 +1193,8 @@ class graph {
function print_TTF($message) {
$points = $message['points'];
$angle = $message['angle'];
$text = $message['text'];
// We have to manually reverse the label, since php GD cannot handle RTL characters properly in UTF8 strings.
$text = (right_to_left()) ? core_text::strrev($message['text']) : $message['text'];
$colour = $this->colour[$message['colour']];
$font = $this->parameter['path_to_fonts'].$message['font'];