rik/plibreader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix a defect in unicode handling

Browse Source 
git-svn-id: http://php-reader.googlecode.com/svn/trunk@144 51a70ab9-7547-0410-9469-37e369ee0574
This commit is contained in:
svollbehr
2009-03-25 20:02:05 +00:00
parent aeadea825d
commit 618d083fad
12 changed files with 75 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/ID3/Frame/AbstractText.php
View File

@@ -89,13 +89,11 @@ abstract class ID3_Frame_AbstractText extends ID3_Frame
switch ($encoding) {
case self::UTF16:
$this->_text = $this->_convertString
($this->_explodeString16(Transform::fromString16($this->_data)),
"utf-16");
($this->_explodeString16($this->_data), "utf-16");
break;
case self::UTF16BE:
$this->_text = $this->_convertString
($this->_explodeString16(Transform::fromString16BE($this->_data)),
"utf-16be");
($this->_explodeString16($this->_data), "utf-16be");
break;
case self::UTF8:
$this->_text = $this->_convertString
@@ -170,17 +168,12 @@ abstract class ID3_Frame_AbstractText extends ID3_Frame
{
$data = Transform::toUInt8($this->_encoding);
switch ($this->_encoding) {
case self::UTF16:
case self::UTF16LE:
$array = $this->_text;
foreach ($array as &$text)
$text = Transform::toString16($text);
$data .= Transform::toString16
(implode("\0\0", $array), $this->_encoding == self::UTF16 ?
Transform::MACHINE_ENDIAN_ORDER : Transform::LITTLE_ENDIAN_ORDER);
$data .= 0xfeff . implode(0xfeff . "\0\0", $this->_text);
break;
case self::UTF16:
case self::UTF16BE:
$data .= Transform::toString16BE(implode("\0\0", $this->_text));
$data .= implode("\0\0", $this->_text);
break;
default:
$data .= implode("\0", $this->_text);