Changeset 21109


Ignore:
Timestamp:
2011/08/03 17:02:50 (9 years ago)
Author:
nanasess
bzr:base-revision:
svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_11-dev:21108
bzr:committer:
Kentaro Ohkouchi <ohkouchi@loop-az.jp>
bzr:file-ids:

data/class/pages/shopping/LC_Page_Shopping_Multiple.php lc_page_shopping_mul-20110109122547-u3fq5xmi1b4jn5n4-2
bzr:mapping-version:
v4
bzr:merge:

ohkouchi@loop-az.jp-20110803080200-qgx54ov0l7llmrmk
bzr:repository-uuid:
1e3b908f-19a9-db11-a64c-001125224ba8
bzr:revision-id:
ohkouchi@loop-az.jp-20110803080248-6xrvcwuke30or3d3
bzr:revno:
3812
bzr:revprop:branch-nick:
branches/version-2_11-dev
bzr:root:
branches/version-2_11-dev
bzr:testament:

bazaar-ng testament short form 2.1
revision-id: ohkouchi@loop-az.jp-20110803080248-6xrvcwuke30or3d3
sha1: cb9d97f275c70735c89419eed8c08e2bf6a15072
bzr:text-parents:

data/class/pages/shopping/LC_Page_Shopping_Multiple.php svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_11-dev:21100
bzr:timestamp:
2011-08-03 17:02:48.638000011 +0900
bzr:user-agent:
bzr2.3.1+bzr-svn1.1.0dev0
Message:

#1422 (複数配送設定時に他の会員の情報が表示されてしまう)

  • array_merge で連想配列の数値添字が初期化されてしまうのを修正
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/version-2_11-dev/data/class/pages/shopping/LC_Page_Shopping_Multiple.php

    r21100 r21109  
    7575                                            $this->tpl_uniqid); 
    7676        $this->tpl_addrmax = count($this->addrs); 
    77         $this->addrs = array_merge(array('' => '選択してください'), $this->addrs); 
    7877        $this->lfInitParam($objFormParam); 
    7978 
     
    181180        $arrPref = $masterData->getMasterData('mtb_pref'); 
    182181 
     182        $arrResults = array('' => '選択してください'); 
    183183        // 会員ログイン時 
    184184        if ($objCustomer->isLoginSuccess(true)) { 
    185185            $arrAddrs = $objCustomer->getCustomerAddress($objCustomer->getValue('customer_id')); 
    186             $arrResults = array(); 
    187186            foreach ($arrAddrs as $val) { 
    188187                $other_deliv_id = SC_Utils_Ex::isBlank($val['other_deliv_id']) ? 0 : $val['other_deliv_id']; 
Note: See TracChangeset for help on using the changeset viewer.