Index: branches/version-2_5-dev/data/module/fpdf/fpdf_tpl.php
===================================================================
--- branches/version-2_5-dev/data/module/fpdf/fpdf_tpl.php	(revision 19716)
+++ branches/version-2_5-dev/data/module/fpdf/fpdf_tpl.php	(revision 20024)
@@ -260,5 +260,5 @@
      * 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();
Index: branches/version-2_5-dev/data/require_compat.php
===================================================================
--- branches/version-2_5-dev/data/require_compat.php	(revision 19988)
+++ branches/version-2_5-dev/data/require_compat.php	(revision 20024)
@@ -29,10 +29,14 @@
 // 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");
+}
 ?>
Index: branches/version-2_5-dev/data/class/helper/SC_Helper_DB.php
===================================================================
--- branches/version-2_5-dev/data/class/helper/SC_Helper_DB.php	(revision 20021)
+++ branches/version-2_5-dev/data/class/helper/SC_Helper_DB.php	(revision 20024)
@@ -1850,5 +1850,5 @@
      * @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();
 
Index: branches/version-2_5-dev/data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php
===================================================================
--- branches/version-2_5-dev/data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php	(revision 19805)
+++ branches/version-2_5-dev/data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php	(revision 20024)
@@ -287,5 +287,5 @@
      */
     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);