Merge pull request #37 from RomanSyroeshko/PHPWord#34

Progi1984 · Progi1984 · commit e345d862b710 · 2013-12-15T03:17:48.000-08:00
PHPWord_Shared_String.IsUTF8 returns FALSE for Cyrillic UTF-8 input
diff --git a/src/PHPWord/Shared/String.php b/src/PHPWord/Shared/String.php
@@ -141,13 +141,13 @@ public static function ControlCharacterPHP2OOXML($value = '') {
 	}
 
 	/**
-	 * Check if a string contains UTF8 data
+	 * Check if a string contains UTF-8 data
 	 *
 	 * @param string $value
 	 * @return boolean
 	 */
 	public static function IsUTF8($value = '') {
-		return utf8_encode(utf8_decode($value)) === $value;
+		return $value === '' || preg_match('/^./su', $value) === 1;
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -141,13 +141,13 @@ public static function ControlCharacterPHP2OOXML($value = '') {`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`/**`
`144`		`- * Check if a string contains UTF8 data`
	`144`	`+ * Check if a string contains UTF-8 data`
`145`	`145`	`*`
`146`	`146`	`* @param string $value`
`147`	`147`	`* @return boolean`
`148`	`148`	`*/`
`149`	`149`	`public static function IsUTF8($value = '') {`
`150`		`- return utf8_encode(utf8_decode($value)) === $value;`
	`150`	`+ return $value === '' \|\| preg_match('/^./su', $value) === 1;`
`151`	`151`	`}`
`152`	`152`
`153`	`153`	`/**`