Changeset 20024

Timestamp:

2011/01/21 15:27:51 (15 years ago)

Author:

nanasess

bzr:base-revision:

[email protected]

bzr:committer:

Kentaro Ohkouchi <[email protected]>

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:

[email protected]

bzr:repository-uuid:

1e3b908f-19a9-db11-a64c-001125224ba8

bzr:revision-id:

[email protected]

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 [email protected]
data/class/helper/SC_Helper_DB.php [email protected]
data/module/fpdf/fpdf_tpl.php [email protected]
data/require_compat.php [email protected]

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:

• class/db/dbfactory/SC_DB_DBFactory_MYSQL.php (modified) (1 diff)
• class/helper/SC_Helper_DB.php (modified) (1 diff)
• module/fpdf/fpdf_tpl.php (modified) (1 diff)
• require_compat.php (modified) (1 diff)

branches/version-2_5-dev/data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php

@@ -287 +287 @@
      */
     function sfChangeArrayToString($sql){
-        if(stripos($sql, 'ARRAY_TO_STRING') !== FALSE) {
+        if(strpos(strtoupper($sql), 'ARRAY_TO_STRING') !== FALSE) {
             preg_match_all('/ARRAY_TO_STRING.*?\(.*?ARRAY\(.*?SELECT (.+?) FROM (.+?) WHERE (.+?)\).*?\,.*?\'(.+?)\'.*?\)/is', $sql, $match, PREG_SET_ORDER);
             

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

@@ -1850 +1850 @@
      * @return void
      */
-    function sfUpdateOrderStatus($orderId, $newStatus = null, $newAddPoint = null, $newUsePoint = null, &$sqlval = array()) {
+    function sfUpdateOrderStatus($orderId, $newStatus = null, $newAddPoint = null, $newUsePoint = null) {
         $objQuery =& SC_Query::getSingletonInstance();
 

branches/version-2_5-dev/data/module/fpdf/fpdf_tpl.php

@@ -260 +260 @@
      * See FPDF/TCPDF-Documentation ;-)
      */
-    public function SetFont($family, $style = '', $size = 0) {
+    function SetFont($family, $style = '', $size = 0) {
         if (is_subclass_of($this, 'TCPDF')) {
             $args = func_get_args();

branches/version-2_5-dev/data/require_compat.php

@@ -29 +29 @@
 // hash_algos (PHP 5 >= 5.1.2, PECL hash >= 1.1)
 // パスワード・リマインダーのハッシュ暗号化に利用
-PHP_Compat::loadFunction("hash_algos");
-
+// XXX PHP_Compat::loadFunction("hash_algos"); // include_once のパス相違
+if (!function_exists('hash_algos')) {
+    require_once(DATA_REALDIR . "module/Compat/Compat/Function/hash_algos.php");
+}
 // hash_hmac (PHP 5 >= 5.1.2, PECL hash >= 1.1)
 // パスワード・リマインダーのハッシュ暗号化に利用
 // http://pear.php.net/bugs/bug.php?id=16521 よりPHP_Compat互換仕様のhash関連関数追加
-PHP_Compat::loadFunction("hash_hmac");
-
+// XXX PHP_Compat::loadFunction("hash_hmac"); // include_once のパス相違
+if (!function_exists('hash_hmac')) {
+    require_once(DATA_REALDIR . "module/Compat/Compat/Function/hash_hmac.php");
+}
 ?>