Changeset 23648 for branches

Timestamp:

2014/10/12 14:06:47 (10 years ago)

Author:

kim

Message:

#2544 r23409 をリバート

既存への影響確認が不十分のため、2.13.3としては見送ります

Location:

branches/version-2_13_3/data/class

Files:

• SC_Display.php (modified) (1 diff)
• SC_SiteView.php (modified) (1 diff)
• helper/SC_Helper_Mail.php (modified) (1 diff)

branches/version-2_13_3/data/class/SC_Display.php

@@ -116 +116 @@
                 }
                 $this->response->setContentType('text/html');
-                $this->setView(new SC_SiteView_Ex(true, DEVICE_TYPE_MOBILE));
+                $this->setView(new SC_MobileView_Ex());
                 break;
             case DEVICE_TYPE_SMARTPHONE:
-                $this->setView(new SC_SiteView_Ex(true, DEVICE_TYPE_SMARTPHONE));
+                $this->setView(new SC_SmartphoneView_Ex());
                 break;
             case DEVICE_TYPE_PC:
-                $this->setView(new SC_SiteView_Ex(true, DEVICE_TYPE_PC));
+                $this->setView(new SC_SiteView_Ex());
                 break;
             case DEVICE_TYPE_ADMIN:

branches/version-2_13_3/data/class/SC_SiteView.php

@@ -24 +24 @@
 class SC_SiteView extends SC_View_Ex
 {
-    public function __construct($setPrevURL = true, $device = DEVICE_TYPE_PC)
+    public function __construct($setPrevURL = true)
     {
         parent::__construct();
-
-        switch ($device) {
-            case DEVICE_TYPE_MOBILE:
-                $this->_smarty->template_dir = realpath(MOBILE_TEMPLATE_REALDIR);
-                $this->_smarty->compile_dir = realpath(MOBILE_COMPILE_REALDIR);
-                $this->assignTemplatePath(DEVICE_TYPE_MOBILE);
-                break;
-
-            case DEVICE_TYPE_SMARTPHONE:
-                $this->_smarty->template_dir = realpath(SMARTPHONE_TEMPLATE_REALDIR);
-                $this->_smarty->compile_dir = realpath(SMARTPHONE_COMPILE_REALDIR);
-                $this->assignTemplatePath(DEVICE_TYPE_SMARTPHONE);
-                break;
-
-            case DEVICE_TYPE_PC:
-                $this->_smarty->template_dir = realpath(TEMPLATE_REALDIR);
-                $this->_smarty->compile_dir = realpath(COMPILE_REALDIR);
-                $this->assignTemplatePath(DEVICE_TYPE_PC);
-                break;
-        }
 
         if ($setPrevURL) {
             $this->setPrevURL();
         }
+    }
 
-        SC_Helper_Plugin_Ex::hook("SC_SiteView_Construct_After", array($this));
+    public function init()
+    {
+        parent::init();
+
+        $this->_smarty->template_dir = realpath(TEMPLATE_REALDIR);
+        $this->_smarty->compile_dir = realpath(COMPILE_REALDIR);
+
+        $this->assignTemplatePath(DEVICE_TYPE_PC);
     }
 

branches/version-2_13_3/data/class/helper/SC_Helper_Mail.php

@@ -181 +181 @@
         // 注文受付メール(携帯)
         if ($template_id == 2) {
-            $objMailView = new SC_SiteView_Ex(true, DEVICE_TYPE_MOBILE);
+            $objMailView = new SC_MobileView_Ex();
         } else {
             $objMailView = new SC_SiteView_Ex();