Index: branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php	(revision 18820)
+++ branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php	(revision 18847)
@@ -369,10 +369,8 @@
         
         // 同一のURLが存在している場合にはエラー
-        $sqlWhere = '';
         $params = array();
         
-        $sqlWhere .= ' (url = ? OR url = ?)';
+        $sqlWhere = 'url = ?';
         $params[] = USER_DIR . $array['url'] . '.php';
-        $params[] = USER_URL . $array['url'] . '.php'; // 従来形式
         
         // プレビュー用のレコードは除外
Index: branches/version-2_5-dev/data/class/helper/SC_Helper_PageLayout.php
===================================================================
--- branches/version-2_5-dev/data/class/helper/SC_Helper_PageLayout.php	(revision 18701)
+++ branches/version-2_5-dev/data/class/helper/SC_Helper_PageLayout.php	(revision 18847)
@@ -54,7 +54,7 @@
             }
             
-            $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");