Changeset 19804

Timestamp:

2010/12/31 23:16:57 (12 years ago)

Author:

Seasoft

Message:

#834(パラメータの定数名に「URL」を含むにもかかわらず、パスのみのものがある) 一部実装
#748(モバイル/スマートフォンのデザイン管理)

• r19774続き

File:

• branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php (modified) (5 diffs)

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

@@ -23 +23 @@
 
 // {{{ requires
-require_once(CLASS_FILE_PATH . "pages/admin/LC_Page_Admin.php");
+require_once(CLASS_REALDIR . "pages/admin/LC_Page_Admin.php");
 
 /**
@@ -147 +147 @@
         $arrPageData = $this->objLayout->lfGetPageData("page_id = ? AND device_type_id = ?",
                                                        array($page_id, $device_type_id));
-        
 
         if (strlen($arrPageData[0]['filename']) == 0) {
@@ -187 +186 @@
         $tmpPost['page_id'] = $page_id;
         $tmpPost['url'] = $url;
-        $tmpPost['tpl_dir'] = USER_FILE_PATH . "templates/preview/";
+        $tmpPost['tpl_dir'] = USER_REALDIR . "templates/preview/";
 
         $arrPreData = $this->objLayout->lfGetPageData("page_id = ? AND device_type_id = ?",
@@ -233 +232 @@
         if (count($this->arrErr) == 0) {
             // DBへデータを更新する
-            $arrData = $this->lfEntryPageData($_POST, $device_type_id);
+            $arrTmp = $this->lfEntryPageData($_POST, $device_type_id);
+            $page_id = $arrTmp['page_id'];
+
+            $arrTmp = $this->objLayout->lfGetPageData('page_id = ? AND device_type_id = ?', array($page_id, $device_type_id));
+            $arrData = $arrTmp[0];
 
             // ベースデータでなければファイルを削除し、PHPファイルを作成する
@@ -291 +294 @@
             $objQuery->update('dtb_pagelayout', $sqlval, 'page_id = ? AND device_type_id = ?',
                               array($arrData['page_id'], $device_type_id));
+            // 戻り値用
+            $sqlval['page_id'] = $arrData['page_id'];
         }
         return $sqlval;