Changeset 18847

Timestamp:

2010/10/05 11:32:40 (14 years ago)

Author:

Seasoft

Message:

#638(ページ詳細設定で追加したページも初期登録のデータと同様の形式に)

• comment:1 実装

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) (1 diff)

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

@@ -54 +54 @@
             }
             
-            $url2 = preg_replace('|^http://[^/]+' . preg_quote(URL_DIR) . '|', '', $url);
+            $url = preg_replace('|^http://[^/]+' . preg_quote(URL_DIR) . '|', '', $url);
             // URLを元にページデザインを取得
-            $arrPageData = $this->lfgetPageData("url IN (?, ?) AND page_id <> 0" , array($url2, $url)); // $url は従来互換
+            $arrPageData = $this->lfgetPageData("url = ? AND page_id <> 0" , array($url));
         } else {
             $arrPageData = $this->lfgetPageData("page_id = 0");

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

@@ -369 +369 @@
         
         // 同一のURLが存在している場合にはエラー
-        $sqlWhere = '';
         $params = array();
         
-        $sqlWhere .= ' (url = ? OR url = ?)';
+        $sqlWhere = 'url = ?';
         $params[] = USER_DIR . $array['url'] . '.php';
-        $params[] = USER_URL . $array['url'] . '.php'; // 従来形式
         
         // プレビュー用のレコードは除外