Changeset 18504


Ignore:
Timestamp:
2010/01/22 19:29:18 (12 years ago)
Author:
nanasess
bzr:base-revision:
ohkouchi@loop-az.jp-20100122085858-swz18up2y28i1zlm
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-20100122102915-sj2zmacnmj7dbztl
bzr:revno:
1913
bzr:revprop:branch-nick:
branches/version-2_4-dev
bzr:root:
branches/version-2_4-dev
bzr:timestamp:
2010-01-22 19:29:15.697000027 +0900
bzr:user-agent:
bzr2.0.1+bzr-svn1.0.1
svn:original-date:
2010-01-22T10:29:15.697000Z
Message:

配列が多次元配列だった場合は, 再帰するように修正(#488)

File:
1 edited

Legend:

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

    r18503 r18504  
    157157        $arrResult = array(); 
    158158        foreach ($arrMethod as $key => $val) { 
    159             $encoding = mb_detect_encoding($val); 
    160             if (CHAR_CODE != $encoding) { 
    161                 $arrResult[$key] = mb_convert_encoding($val, CHAR_CODE, $encoding); 
     159            if (is_array($val)) { 
     160                $arrResult[$key] = $this->checkConvertEncoding($val); 
    162161            } else { 
    163                 $arrResult[$key] = $val; 
     162                $encoding = mb_detect_encoding($val); 
     163                if (CHAR_CODE != $encoding) { 
     164                    $arrResult[$key] = mb_convert_encoding($val, CHAR_CODE, $encoding); 
     165                } else { 
     166                    $arrResult[$key] = $val; 
     167                } 
    164168            } 
    165169        } 
Note: See TracChangeset for help on using the changeset viewer.