[Svn-src-all:2689] [version-2_12-dev 21588] #1613 (typo修正・ソース整形・ソースコメントの改善)

[Seasoft]

Subversion committed to /home/svn/open 21588
http://svn.ec-cube.net/open_trac/changeset/21588
┌────────────────────────────┐
│更新者　:  Seasoft                                      │
│更新日時:  2012-03-04 22:16:24 +0900 (日, 04  3月 2012)│
└────────────────────────────┘

Log:
--------------------------------------------------------
#1613 (typo修正・ソース整形・ソースコメントの改善)

Changed:                      [U:修正，A:追加，D:削除]
--------------------------------------------------------
U   branches/version-2_12-dev/data/class/pages/LC_Page.php
U   branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Plugin.php
U   branches/version-2_12-dev/data/class/util/SC_Utils.php

変更: branches/version-2_12-dev/data/class/pages/LC_Page.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/LC_Page.php	2012-03-04 13:10:00 UTC (rev 21587)
+++ branches/version-2_12-dev/data/class/pages/LC_Page.php	2012-03-04 13:16:24 UTC (rev 21588)
@@ -131,7 +131,7 @@
         // HeadNaviにpluginテンプレートを追加する.
         $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg);
         $objPlugin->setHeadNaviBlocs($this->arrPageLayout['HeadNavi']);
-        
+
         // スーパーフックポイントを実行.
         $objPlugin->doAction('lc_page_process', array($this));
 

変更: branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Plugin.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Plugin.php	2012-03-04 13:10:00 UTC (rev 21587)
+++ branches/version-2_12-dev/data/class/pages/admin/system/LC_Page_Admin_System_Plugin.php	2012-03-04 13:16:24 UTC (rev 21588)
@@ -109,7 +109,7 @@
                 break;
             // 有効化
             case 'enable':
- 
+
                 // エラーチェック
                 $this->arrErr = $objFormParam->checkError();
                 if ($this->isError($this->arrErr) === false) {

変更: branches/version-2_12-dev/data/class/util/SC_Utils.php
===================================================================
--- branches/version-2_12-dev/data/class/util/SC_Utils.php	2012-03-04 13:10:00 UTC (rev 21587)
+++ branches/version-2_12-dev/data/class/util/SC_Utils.php	2012-03-04 13:16:24 UTC (rev 21588)
@@ -1296,17 +1296,13 @@
     }
 
     /**
-     * XML宣言を出力する.
+     * 前方互換用
      *
-     * XML宣言があると問題が発生する UA は出力しない.
-     *
-     * @return string XML宣言の文字列
+     * @deprecated 2.12.0 GC_Utils_Ex::printXMLDeclaration を使用すること
      */
     function printXMLDeclaration() {
-        $ua = $_SERVER['HTTP_USER_AGENT'];
-        if (!preg_match('/MSIE/', $ua) || preg_match('/MSIE 7/', $ua)) {
-            echo '<?xml version="1.0" encoding="' . CHAR_CODE . '"?>' . "\n";
-        }
+        trigger_error('前方互換用メソッドが使用されました。', E_USER_WARNING);
+        GC_Utils_Ex::printXMLDeclaration();
     }
 
     /*
@@ -1731,7 +1727,7 @@
         //（複数行HITしているので、どれに該当するか不明の為）
         $zip_cnt = count($data_list);
         if ($zip_cnt > 1) {
-            $data_list[0]['town'] = "";
+            $data_list[0]['town'] = '';
         }
         unset($zip_cnt);
 
@@ -1745,7 +1741,7 @@
         $town =  $data_list[0]['town'];
         $town = preg_replace("/（.*）$/","",$town);
         $town = preg_replace('/以下に掲載がない場合/','',$town);
-        $town = preg_replace("/(.*?)の次に番地がくる場合/","",$town);
+        $town = preg_replace('/(.*?)の次に番地がくる場合/',"",$town);
         $data_list[0]['town'] = $town;
         $data_list[0]['state'] = $arrREV_PREF[$data_list[0]['state']];