Changeset 20024


Ignore:
Timestamp:
2011/01/21 15:27:51 (11 years ago)
Author:
nanasess
bzr:base-revision:
ohkouchi@loop-az.jp-20110120100206-bis1evyw1k5qwz7u
bzr:committer:
Kentaro Ohkouchi <ohkouchi@loop-az.jp>
bzr:file-ids:

data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php 15123@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fdb%2Fdbfactory%2FSC_DB_DBFactory_MYSQL.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/module/fpdf/fpdf_tpl.php 19716@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_5-dev%2Fdata%2Fmodule%2Ffpdf%2Ffpdf_tpl.php
data/require_compat.php 19986@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_5-dev%2Fdata%2Frequire_compat.php
bzr:mapping-version:
v4
bzr:merge:

ohkouchi@loop-az.jp-20110121060113-sowzoccgo16u8ikp
bzr:repository-uuid:
1e3b908f-19a9-db11-a64c-001125224ba8
bzr:revision-id:
ohkouchi@loop-az.jp-20110121062747-yen294amtopcetpk
bzr:revno:
2752
bzr:revprop:branch-nick:
branches/version-2_5-dev
bzr:root:
branches/version-2_5-dev
bzr:text-revisions:

data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php ohkouchi@loop-az.jp-20110121060113-sowzoccgo16u8ikp
data/class/helper/SC_Helper_DB.php ohkouchi@loop-az.jp-20110121060113-sowzoccgo16u8ikp
data/module/fpdf/fpdf_tpl.php ohkouchi@loop-az.jp-20110121060113-sowzoccgo16u8ikp
data/require_compat.php ohkouchi@loop-az.jp-20110121060113-sowzoccgo16u8ikp
bzr:timestamp:
2011-01-21 15:27:47.727999926 +0900
bzr:user-agent:
bzr2.2.1+bzr-svn1.0.4
svn:original-date:
2011-01-21T06:27:47.728000Z
Message:

#854(PHP4対応)

  • PHP4.3.11 で動作確認
Location:
branches/version-2_5-dev/data
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/version-2_5-dev/data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php

    r19805 r20024  
    287287     */ 
    288288    function sfChangeArrayToString($sql){ 
    289         if(stripos($sql, 'ARRAY_TO_STRING') !== FALSE) { 
     289        if(strpos(strtoupper($sql), 'ARRAY_TO_STRING') !== FALSE) { 
    290290            preg_match_all('/ARRAY_TO_STRING.*?\(.*?ARRAY\(.*?SELECT (.+?) FROM (.+?) WHERE (.+?)\).*?\,.*?\'(.+?)\'.*?\)/is', $sql, $match, PREG_SET_ORDER); 
    291291             
  • branches/version-2_5-dev/data/class/helper/SC_Helper_DB.php

    r20021 r20024  
    18501850     * @return void 
    18511851     */ 
    1852     function sfUpdateOrderStatus($orderId, $newStatus = null, $newAddPoint = null, $newUsePoint = null, &$sqlval = array()) { 
     1852    function sfUpdateOrderStatus($orderId, $newStatus = null, $newAddPoint = null, $newUsePoint = null) { 
    18531853        $objQuery =& SC_Query::getSingletonInstance(); 
    18541854 
  • branches/version-2_5-dev/data/module/fpdf/fpdf_tpl.php

    r19716 r20024  
    260260     * See FPDF/TCPDF-Documentation ;-) 
    261261     */ 
    262     public function SetFont($family, $style = '', $size = 0) { 
     262    function SetFont($family, $style = '', $size = 0) { 
    263263        if (is_subclass_of($this, 'TCPDF')) { 
    264264            $args = func_get_args(); 
  • branches/version-2_5-dev/data/require_compat.php

    r19988 r20024  
    2929// hash_algos (PHP 5 >= 5.1.2, PECL hash >= 1.1) 
    3030// パスワード・リマインダーのハッシュ暗号化に利用 
    31 PHP_Compat::loadFunction("hash_algos"); 
    32  
     31// XXX PHP_Compat::loadFunction("hash_algos"); // include_once のパス相違 
     32if (!function_exists('hash_algos')) { 
     33    require_once(DATA_REALDIR . "module/Compat/Compat/Function/hash_algos.php"); 
     34} 
    3335// hash_hmac (PHP 5 >= 5.1.2, PECL hash >= 1.1) 
    3436// パスワード・リマインダーのハッシュ暗号化に利用 
    3537// http://pear.php.net/bugs/bug.php?id=16521 よりPHP_Compat互換仕様のhash関連関数追加 
    36 PHP_Compat::loadFunction("hash_hmac"); 
    37  
     38// XXX PHP_Compat::loadFunction("hash_hmac"); // include_once のパス相違 
     39if (!function_exists('hash_hmac')) { 
     40    require_once(DATA_REALDIR . "module/Compat/Compat/Function/hash_hmac.php"); 
     41} 
    3842?> 
Note: See TracChangeset for help on using the changeset viewer.