Ignore:
Timestamp:
2011/01/27 15:49:19 (15 years ago)
Author:
nanasess
bzr:base-revision:
svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:20037
bzr:committer:
Kentaro Ohkouchi <[email protected]>
bzr:file-ids:

data/class/SC_CartSession.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_CartSession.php
data/class/SC_Query.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_Query.php
data/class/helper/SC_Helper_DB.php 15176@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fhelper%2FSC_Helper_DB.php
data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Category.php 15367@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Ffrontparts%2Fbloc%2FLC_Page_FrontParts_Bloc_Category.php
data/mtb_constants_init.php 16505@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fmtb_constants_init.php
docs/eccube-diagram.jude eccubediagram.jude-20101102081620-jpq1fqmox6ocmuj3-2
html/install/sql/insert_data.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Finsert_data.sql
bzr:mapping-version:
v4
bzr:merge:

[email protected]
bzr:repository-uuid:
1e3b908f-19a9-db11-a64c-001125224ba8
bzr:revision-id:
[email protected]
bzr:revno:
2766
bzr:revprop:branch-nick:
branches/version-2_5-dev
bzr:root:
branches/version-2_5-dev
bzr:text-revisions:

data/class/SC_CartSession.php [email protected]
data/class/SC_Query.php [email protected]
data/class/helper/SC_Helper_DB.php [email protected]
data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Category.php [email protected]
data/mtb_constants_init.php [email protected]
html/install/sql/insert_data.sql [email protected]
bzr:timestamp:
2011-01-27 15:49:15.256999969 +0900
bzr:user-agent:
bzr2.2.1+bzr-svn1.0.4
svn:original-date:
2011-01-27T06:49:15.257000Z
Message:

#628(未使用処理・定義などの削除)

  • ODERSTATUS_COMMIT を削除

#644(変数の定義・初期化を行なう)

  • Notice や Warning を修正
Location:
branches/version-2_5-dev/data
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • branches/version-2_5-dev/data/class/SC_CartSession.php

    r20007 r20038  
    3232    /* コンストラクタ */ 
    3333    function SC_CartSession($cartKey = "cart") { 
     34        if (!isset($_SESSION[$cartKey])) { 
     35            $_SESSION[$cartKey] = array(); 
     36        } 
    3437        $this->cartSession =& $_SESSION[$cartKey]; 
    3538    } 
    … …  
    251254        // ページチェックを行う。 
    252255        foreach($arrExclude as $val) { 
    253             if(preg_match("/" . preg_quote($val) . "/", $url)) { 
     256            if(preg_match("|" . preg_quote($val) . "|", $url)) { 
    254257                $exclude = true; 
    255258                break; 

  • branches/version-2_5-dev/data/class/SC_Query.php

    r20037 r20038  
    9797     */ 
    9898    function getSingletonInstance($dsn = "", $force_run = false, $new = false) { 
    99         if (is_null($this->instance)) { 
     99        if (!isset($this->instance) || is_null($this->instance)) { 
    100100            $this->instance =& new SC_Query($dsn, $force_run, $new); 
    101101        } 

  • branches/version-2_5-dev/data/class/helper/SC_Helper_DB.php

    r20032 r20038  
    171171                $category_id = $this->sfGetCategoryId($_GET['product_id'], $_GET['category_id']); 
    172172                // ROOTカテゴリIDの取得 
    173                 $arrRet = $this->sfGetParents($objQuery, 'dtb_category', 'parent_category_id', 'category_id', $category_id); 
     173                $arrRet = $this->sfGetParents('dtb_category', 'parent_category_id', 'category_id', $category_id); 
    174174                $root_id = isset($arrRet[0]) ? $arrRet[0] : ""; 
    175175            } else { 
    … …  
    488488        $arrRet = $objQuery->select($col, $from, $where); 
    489489 
    490         $arrParentID = $this->sfGetParents($objQuery, 'dtb_category', 'parent_category_id', 'category_id', $parent_category_id); 
     490        $arrParentID = $this->sfGetParents('dtb_category', 'parent_category_id', 'category_id', $parent_category_id); 
    491491 
    492492        foreach($arrRet as $key => $array) { 
    … …  
    560560        $arrCatTree = array(); 
    561561        foreach ($arrCategory_id as $pkey => $parent_category_id) { 
    562             $arrParentID = $this->sfGetParents($objQuery, 'dtb_category', 'parent_category_id', 'category_id', $parent_category_id); 
     562            $arrParentID = $this->sfGetParents('dtb_category', 'parent_category_id', 'category_id', $parent_category_id); 
    563563 
    564564            foreach($arrParentID as $pid) { 
    … …  
    584584        // 商品が属するカテゴリIDを縦に取得 
    585585        $objQuery =& SC_Query::getSingletonInstance(); 
    586         $arrCatID = $this->sfGetParents($objQuery, "dtb_category", "parent_category_id", "category_id", $category_id); 
     586        $arrCatID = $this->sfGetParents("dtb_category", "parent_category_id", "category_id", $category_id); 
    587587        $ConbName = ""; 
    588588 
    … …  
    626626        $objQuery =& SC_Query::getSingletonInstance(); 
    627627        $arrRet = array(); 
    628         $arrCatID = $this->sfGetParents($objQuery, "dtb_category", "parent_category_id", "category_id", $category_id); 
     628        $arrCatID = $this->sfGetParents("dtb_category", "parent_category_id", "category_id", $category_id); 
    629629        $arrRet['id'] = $arrCatID[0]; 
    630630 
    … …  
    982982        foreach ($arrDiffCategory_id as $parent_category_id) { 
    983983            $arrTgtCategory_id[] = $parent_category_id; 
    984             $arrParentID = $this->sfGetParents($objQuery, 'dtb_category', 'parent_category_id', 'category_id', $parent_category_id); 
     984            $arrParentID = $this->sfGetParents('dtb_category', 'parent_category_id', 'category_id', $parent_category_id); 
    985985            foreach($arrParentID as $pid) { 
    986986                $arrTgtCategory_id[] = $pid; 
    … …  
    11061106     * @return array 親IDの配列 
    11071107     */ 
    1108     function sfGetParents($objQuery, $table, $pid_name, $id_name, $id) { 
     1108    function sfGetParents($table, $pid_name, $id_name, $id) { 
    11091109        $arrRet = $this->sfGetParentsArray($table, $pid_name, $id_name, $id); 
    11101110        // 配列の先頭1つを削除する。 

  • branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Category.php

    r19903 r20038  
    102102 
    103103        foreach ($arrParent_category_id as $category_id) { 
    104             $arrParentID = $objDb->sfGetParents($objQuery, 'dtb_category', 'parent_category_id', 'category_id', $category_id); 
     104            $arrParentID = $objDb->sfGetParents('dtb_category', 'parent_category_id', 'category_id', $category_id); 
    105105            $arrBrothersID = SC_Utils_Ex::sfGetBrothersArray($arrRet, 'parent_category_id', 'category_id', $arrParentID); 
    106106            $arrChildrenID = SC_Utils_Ex::sfGetUnderChildrenArray($arrRet, 'parent_category_id', 'category_id', $category_id); 

  • branches/version-2_5-dev/data/mtb_constants_init.php

    r20005 r20038  
    355355/** メールアドレス種別 */ 
    356356define('MAIL_TYPE_MOBILE', 2); 
    357 /** 受注ステータス変更の際にポイント等を加算するステータス番号 (発送済み) */ 
    358 define('ODERSTATUS_COMMIT', ORDER_DELIV); 
    359357/** 新着情報管理画面 開始年(西暦) */ 
    360358define('ADMIN_NEWS_STARTYEAR', 2005); 
Note: See TracChangeset for help on using the changeset viewer.