Changeset 19777 for branches/version-2_5-dev/data/class

Timestamp:

2010/12/28 18:33:47 (16 years ago)

Author:

Seasoft

Message:

#748(モバイル/スマートフォンのデザイン管理)

• r19774 続き

#877(default.php の問題)

Location:

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

Files:

• helper/SC_Helper_PageLayout.php (modified) (1 diff)
• pages/admin/design/LC_Page_Admin_Design_MainEdit.php (modified) (3 diffs)

branches/version-2_5-dev/data/class/helper/SC_Helper_PageLayout.php

@@ -64 +64 @@
         $arrPageLayout = $arrPageData[0];
 
-        $objPage->tpl_mainpage = $this->getTemplatePath($device_type_id) . $arrPageLayout['filename'] . ".tpl";
+        $objPage->tpl_mainpage = $this->getTemplatePath($device_type_id) . $arrPageLayout['tpl_dir'] . $arrPageLayout['filename'] . ".tpl";
 
         // ページタイトルを設定

branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php

@@ -242 +242 @@
 
             // TPLファイル作成
-            $cre_tpl = $this->objLayout->getTemplatePath($device_type_id) . $arrData['filename'] . '.tpl';
+            $cre_tpl = $this->objLayout->getTemplatePath($device_type_id) . $arrData['tpl_dir'] . $arrData['filename'] . '.tpl';
             $this->lfCreateFile($cre_tpl, $_POST['tpl_data']);
 
@@ -320 +320 @@
                 $arrUpdData['php_dir'] .= '/';
             }
-            $arrUpdData['tpl_dir']      = substr($this->objLayout->getTemplatePath($devie_type_id), strlen(URL_DIR));
-            $arrUpdData['filename']     = dirname($arrUpdData['url']) . basename($arrUpdData['url']); // 拡張子を付加しない
+            $arrUpdData['tpl_dir']      = $arrUpdData['php_dir'];
+            $arrUpdData['filename']     = basename($arrData['url']); // 拡張子を付加しない
         }
 
@@ -441 +441 @@
 
         // require.phpの場所を書き換える
-        $php_data = str_replace("###require###", str_repeat('../', substr_count($url, '/')) . '../require.php', $php_data);
+        $defaultStrings = "exit; // Don't rewrite. This line is rewritten by EC-CUBE.";
+        $replaceStrings = "require_once '" . str_repeat('../', substr_count($url, '/')) . "../require.php';";
+        $php_data = str_replace($defaultStrings, $replaceStrings, $php_data);
 
         // phpファイルの作成