Changeset 18505 for branches


Ignore:
Timestamp:
2010/01/22 19:53:11 (14 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:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/version-2_4-dev/data/class/SC_Initial.php

    r18504 r18505  
    161161            } else { 
    162162                $encoding = mb_detect_encoding($val); 
    163                 if (CHAR_CODE != $encoding) { 
     163                if ($encoding !== false && $encoding != CHAR_CODE) { 
    164164                    $arrResult[$key] = mb_convert_encoding($val, CHAR_CODE, $encoding); 
    165165                } else { 
Note: See TracChangeset for help on using the changeset viewer.