Changeset 18505 for branches/version-2_4-dev

Timestamp:

2010/01/22 19:53:11 (13 years ago)

Author:

nanasess

bzr:base-revision:

ohkouchi@loop-az.jp-20100122102915-sj2zmacnmj7dbztl

bzr:committer:

Kentaro Ohkouchi <ohkouchi@loop-az.jp>

bzr:file-ids:

data/class/SC_Initial.php 16506@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_Initial.php

bzr:mapping-version:

v4

bzr:repository-uuid:

1e3b908f-19a9-db11-a64c-001125224ba8

bzr:revision-id:

ohkouchi@loop-az.jp-20100122105309-2vtk98n1xsihiw9q

bzr:revno:

1914

bzr:revprop:branch-nick:

branches/version-2_4-dev

bzr:root:

branches/version-2_4-dev

bzr:timestamp:

2010-01-22 19:53:09.134999990 +0900

bzr:user-agent:

bzr2.0.1+bzr-svn1.0.1

svn:original-date:

2010-01-22T10:53:09.135000Z

Message:

文字エンコーディングが検出できなかった場合に対応(#488)

File:

• branches/version-2_4-dev/data/class/SC_Initial.php (modified) (1 diff)

branches/version-2_4-dev/data/class/SC_Initial.php

@@ -161 +161 @@
             } else {
                 $encoding = mb_detect_encoding($val);
-                if (CHAR_CODE != $encoding) {
+                if ($encoding !== false && $encoding != CHAR_CODE) {
                     $arrResult[$key] = mb_convert_encoding($val, CHAR_CODE, $encoding);
                 } else {