[Svn-src-all:2759] [version-2_12-dev 21658] #1430 (PHP5.4対応)

[Seasoft]

Subversion committed to /home/svn/open 21658
http://svn.ec-cube.net/open_trac/changeset/21658
┌────────────────────────────┐
│更新者　:  Seasoft                                      │
│更新日時:  2012-03-20 00:30:27 +0900 (火, 20  3月 2012)│
└────────────────────────────┘

Log:
--------------------------------------------------------
#1430 (PHP5.4対応)
#1679 (PHP 警告撲滅)


Changed:                      [U:修正，A:追加，D:削除]
--------------------------------------------------------
U   branches/version-2_12-dev/data/class/SC_Initial.php
U   branches/version-2_12-dev/data/class/SC_MobileEmoji.php
U   branches/version-2_12-dev/data/class/SC_MobileImage.php

変更: branches/version-2_12-dev/data/class/SC_Initial.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_Initial.php	2012-03-18 15:43:58 UTC (rev 21657)
+++ branches/version-2_12-dev/data/class/SC_Initial.php	2012-03-19 15:30:27 UTC (rev 21658)
@@ -60,6 +60,7 @@
         $this->createCacheDir();            // defineConstants メソッドより後で実行
         $this->stripslashesDeepGpc();
         $this->resetSuperglobalsRequest();  // stripslashesDeepGpc メソッドより後で実行
+        $this->setTimezone();               // 本当はエラーハンドラーより先に読みたい気も
     }
 
     /**
@@ -469,4 +470,13 @@
             define($name, $value);
         }
     }
+
+    /**
+     * タイムゾーンを設定
+     *
+     * @return void
+     */
+    function setTimezone() {
+        date_default_timezone_set('Asia/Tokyo');
+    }
 }

変更: branches/version-2_12-dev/data/class/SC_MobileEmoji.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_MobileEmoji.php	2012-03-18 15:43:58 UTC (rev 21657)
+++ branches/version-2_12-dev/data/class/SC_MobileEmoji.php	2012-03-19 15:30:27 UTC (rev 21658)
@@ -38,7 +38,7 @@
      * @param string 入力
      * @return string 出力
      */
-    function handler($buffer) {
+    static function handler($buffer) {
         $replace_callback = create_function('$matches', 'return SC_MobileEmoji_Ex::indexToCode($matches[1]);');
         return preg_replace_callback('/\[emoji:(e?\d+)\]/', $replace_callback, $buffer);
     }

変更: branches/version-2_12-dev/data/class/SC_MobileImage.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_MobileImage.php	2012-03-18 15:43:58 UTC (rev 21657)
+++ branches/version-2_12-dev/data/class/SC_MobileImage.php	2012-03-19 15:30:27 UTC (rev 21658)
@@ -37,7 +37,7 @@
      * @param string 入力
      * @return string 出力
      */
-    function handler($buffer) {
+    static function handler($buffer) {
 
         // 端末情報を取得する
         $carrier = SC_MobileUserAgent_Ex::getCarrier();