Changeset 21765 for branches/version-2_12-dev

Timestamp:

2012/04/18 16:32:47 (12 years ago)

Author:

shutta

Message:

#1296 SC_* のコンストラクタの拡張が無視される
SC_*Viewの修正

Location:

branches/version-2_12-dev/data/class

Files:

• SC_AdminView.php (modified) (1 diff)
• SC_InstallView.php (modified) (1 diff)
• SC_MobileView.php (modified) (1 diff)
• SC_SiteView.php (modified) (2 diffs)
• SC_SmartphoneView.php (modified) (1 diff)
• SC_View.php (modified) (1 diff)

branches/version-2_12-dev/data/class/SC_AdminView.php

@@ -23 +23 @@
 
 class SC_AdminView extends SC_View_Ex {
-    function SC_AdminView() {
-        parent::SC_View();
+    function __construct() {
+        parent::__construct();
+    }
+
+    function init() {
+        parent::init();
+
         $this->_smarty->template_dir = TEMPLATE_ADMIN_REALDIR;
         $this->_smarty->compile_dir = COMPILE_ADMIN_REALDIR;

branches/version-2_12-dev/data/class/SC_InstallView.php

@@ -23 +23 @@
 
 class SC_InstallView extends SC_View_Ex {
-    function SC_InstallView($template_dir, $compile_dir = COMPILE_REALDIR) {
-        parent::SC_View();
+    function __construct($template_dir, $compile_dir = COMPILE_REALDIR) {
+        parent::__construct();
+
         $this->_smarty->template_dir = $template_dir;
         $this->_smarty->compile_dir = $compile_dir;

branches/version-2_12-dev/data/class/SC_MobileView.php

@@ -23 +23 @@
 
 class SC_MobileView extends SC_SiteView_Ex {
-    function SC_MobileView($setPrevURL = true) {
-        parent::SC_SiteView($setPrevURL);
+    function __construct($setPrevURL = true) {
+        parent::__construct($setPrevURL);
+    }
+
+    function init() {
+        parent::init();
+
         $this->_smarty->template_dir = MOBILE_TEMPLATE_REALDIR;
         $this->_smarty->compile_dir = MOBILE_COMPILE_REALDIR;

branches/version-2_12-dev/data/class/SC_SiteView.php

@@ -23 +23 @@
 
 class SC_SiteView extends SC_View_Ex {
-    function SC_SiteView($setPrevURL = true) {
-        parent::SC_View();
+    function __construct($setPrevURL = true) {
+        parent::__construct();
+
+        if ($setPrevURL) {
+            $this->setPrevURL();
+        }
+    }
+
+    function init() {
+        parent::init();
 
         $this->_smarty->template_dir = TEMPLATE_REALDIR;
@@ -31 +39 @@
         $this->assignTemplatePath(DEVICE_TYPE_PC);
         $this->initpath();
+    }
 
-        if ($setPrevURL) {
+    function setPrevURL() {
             $objCartSess = new SC_CartSession_Ex();
             $objCartSess->setPrevURL($_SERVER['REQUEST_URI']);
-        }
     }
 }

branches/version-2_12-dev/data/class/SC_SmartphoneView.php

@@ -23 +23 @@
 
 class SC_SmartphoneView extends SC_SiteView_Ex {
-    function SC_SmartphoneView($setPrevURL = true) {
-        parent::SC_SiteView($setPrevURL);
+    function __construct($setPrevURL = true) {
+        parent::__construct($setPrevURL);
+    }
+
+    function init() {
+        parent::init();
+
         $this->_smarty->template_dir = SMARTPHONE_TEMPLATE_REALDIR;
         $this->_smarty->compile_dir = SMARTPHONE_COMPILE_REALDIR;

branches/version-2_12-dev/data/class/SC_View.php

@@ -31 +31 @@
 
     // コンストラクタ
-    function SC_View() {
-
+    function __construct() {
+        $this->init();
+    }
+
+    function init() {
         $this->_smarty = new Smarty;
         $this->_smarty->left_delimiter = '<!--{';