mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	lib/graphlib.php
This commit is contained in:
Damyon Wiese 2014-07-10 09:57:06 +08:00
commit a77e8b7b7b
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/graphlib.php
View File

@ -1190,11 +1190,26 @@ class graph {
//ImageColorTransparent($this->image, $this->colour['white']); // colour for transparency //ImageColorTransparent($this->image, $this->colour['white']); // colour for transparency
} }
/**
* Prepare label's text for GD output.
*
* @param string $label string to be prepared.
* @return string Reversed input string, if we are in RTL mode and has no numbers.
* Otherwise, returns the string as is.
*/
private function prepare_label_text($label) {
if (right_to_left() and !preg_match('/[0-9]/i', $label)) {
return core_text::strrev($label);
} else {
return $label;
}
}
function print_TTF($message) { function print_TTF($message) {
$points = $message['points']; $points = $message['points'];
$angle = $message['angle']; $angle = $message['angle'];
// We have to manually reverse the label, since php GD cannot handle RTL characters properly in UTF8 strings. // 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']; $text = $this->prepare_label_text($message['text']);
$colour = $this->colour[$message['colour']]; $colour = $this->colour[$message['colour']];
$font = $this->parameter['path_to_fonts'].$message['font']; $font = $this->parameter['path_to_fonts'].$message['font'];