From: Alexander Ebert <ebert@woltlab.com>
Date: Sat, 13 Oct 2012 23:25:35 +0000 (+0200)
Subject: Fixed support for UTF-8 image text if using broken GD
X-Git-Tag: 2.0.0_Beta_1~879
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d3e0ca881f0b437fa6109f0529ac437a332402b1;p=GitHub%2FWoltLab%2FWCF.git

Fixed support for UTF-8 image text if using broken GD

Fixes #576
---

diff --git a/wcfsetup/install/files/lib/system/image/adapter/GDImageAdapter.class.php b/wcfsetup/install/files/lib/system/image/adapter/GDImageAdapter.class.php
index 4d6283f19a..d4ff07fa33 100644
--- a/wcfsetup/install/files/lib/system/image/adapter/GDImageAdapter.class.php
+++ b/wcfsetup/install/files/lib/system/image/adapter/GDImageAdapter.class.php
@@ -1,5 +1,7 @@
 <?php
 namespace wcf\system\image\adapter;
+use wcf\util\StringUtil;
+
 use wcf\system\exception\SystemException;
 
 /**
@@ -176,6 +178,13 @@ class GDImageAdapter implements IImageAdapter {
 	 * @see	wcf\system\image\adapter\IImageAdapter::drawText()
 	 */
 	public function drawText($string, $x, $y) {
+		if (!StringUtil::isUTF8($string)) {
+			throw new SystemException("Only UTF-8 encoded text can be written onto images"); // GD is buggy with UTF-8
+		}
+		
+		// convert UTF-8 characters > 127 to their numeric representation, e.g. A -> &#65;
+		$string = mb_encode_numericentity($string, array(0x0, 0xFFFF, 0, 0xFFF), 'UTF-8');
+		
 		imageString($this->image, 3, $x, $y, $string, $this->color);
 	}