Index: /branches/version-2_13-dev/data/Smarty/templates/admin/contents/recommend_search.tpl
===================================================================
--- /branches/version-2_13-dev/data/Smarty/templates/admin/contents/recommend_search.tpl (revision 22572)
+++ /branches/version-2_13-dev/data/Smarty/templates/admin/contents/recommend_search.tpl (revision 22856)
@@ -118,5 +118,5 @@
決定 |
- -->
+ -->
@@ -125,5 +125,5 @@
-
+
Index: /branches/version-2_13-dev/data/Smarty/templates/admin/contents/recommend.tpl
===================================================================
--- /branches/version-2_13-dev/data/Smarty/templates/admin/contents/recommend.tpl (revision 22582)
+++ /branches/version-2_13-dev/data/Smarty/templates/admin/contents/recommend.tpl (revision 22856)
@@ -27,5 +27,4 @@
- id="_" />
+ id="_" />
Index: /branches/version-2_13-dev/data/Smarty/templates/admin/order/mail_confirm.tpl
===================================================================
--- /branches/version-2_13-dev/data/Smarty/templates/admin/order/mail_confirm.tpl (revision 22206)
+++ /branches/version-2_13-dev/data/Smarty/templates/admin/order/mail_confirm.tpl (revision 22856)
@@ -41,6 +41,6 @@
メール配信
-
-
+
+
※本文は1通分の例です。受注情報は各メールごとに異なります
Index: /branches/version-2_13-dev/data/Smarty/templates/admin/order/mail.tpl
===================================================================
--- /branches/version-2_13-dev/data/Smarty/templates/admin/order/mail.tpl (revision 22206)
+++ /branches/version-2_13-dev/data/Smarty/templates/admin/order/mail.tpl (revision 22856)
@@ -38,5 +38,5 @@
メール配信
-
+
Index: /branches/version-2_13-dev/data/Smarty/templates/admin/order/edit.tpl
===================================================================
--- /branches/version-2_13-dev/data/Smarty/templates/admin/order/edit.tpl (revision 22776)
+++ /branches/version-2_13-dev/data/Smarty/templates/admin/order/edit.tpl (revision 22856)
@@ -37,5 +37,5 @@
// お届け先名のinputタグのnameを取得
- var shipping_data = $('input[name^=shipping_name01]').attr('name');
+ var shipping_data = $('input[name^=shipping_name01]').attr('name');
var shipping_slt = shipping_data.split("shipping_name01");
Index: /branches/version-2_13-dev/data/Smarty/templates/admin/order/index.tpl
===================================================================
--- /branches/version-2_13-dev/data/Smarty/templates/admin/order/index.tpl (revision 22572)
+++ /branches/version-2_13-dev/data/Smarty/templates/admin/order/index.tpl (revision 22856)
@@ -26,5 +26,4 @@
Index: /branches/version-2_13-dev/data/Smarty/templates/admin/order/multiple.tpl
===================================================================
--- /branches/version-2_13-dev/data/Smarty/templates/admin/order/multiple.tpl (revision 22206)
+++ /branches/version-2_13-dev/data/Smarty/templates/admin/order/multiple.tpl (revision 22856)
@@ -29,5 +29,4 @@
self.moveTo(20,20);self.focus();
$(function() {
-
var product_class_id = window.opener.jQuery('input[id^=product_class_id]');
var product_code = window.opener.jQuery('input[id^=product_code]');
@@ -55,7 +54,5 @@
var index = 0;
for (var i = 0; i < product_class_id.length; i++) {
-
for (var j = 0; j < $(quantity[i]).val(); j++) {
-
// 表示商品名
var dispname = '';
Index: /branches/version-2_13-dev/data/Smarty/templates/admin/ownersstore/plugin.tpl
===================================================================
--- /branches/version-2_13-dev/data/Smarty/templates/admin/ownersstore/plugin.tpl (revision 22572)
+++ /branches/version-2_13-dev/data/Smarty/templates/admin/ownersstore/plugin.tpl (revision 22856)
@@ -25,5 +25,4 @@
Index: /branches/version-2_13-dev/test/TestSuite.php
===================================================================
--- /branches/version-2_13-dev/test/TestSuite.php (revision 22567)
+++ /branches/version-2_13-dev/test/TestSuite.php (revision 22856)
@@ -45,4 +45,5 @@
$suite->addTest(Helper_AllTests::suite());
$suite->addTest(Util_AllTests::suite());
+
return $suite;
}
Index: /branches/version-2_13-dev/templates/default_page.php
===================================================================
--- /branches/version-2_13-dev/templates/default_page.php (revision 22206)
+++ /branches/version-2_13-dev/templates/default_page.php (revision 22856)
@@ -22,10 +22,7 @@
*/
-// {{{ requires
require_once '../require.php';
require_once CLASS_EX_REALDIR . 'page_extends/XXX/LC_Page_XXX_Ex.php';
-// }}}
-// {{{ generate page
$objPage = new LC_Page_XXX_Ex();
Index: /branches/version-2_13-dev/templates/page_class.php
===================================================================
--- /branches/version-2_13-dev/templates/page_class.php (revision 22567)
+++ /branches/version-2_13-dev/templates/page_class.php (revision 22856)
@@ -22,5 +22,4 @@
*/
-// {{{ requires
require_once CLASS_EX_REALDIR . 'page_extends/LC_Page_Ex.php';
@@ -32,10 +31,6 @@
* @version $Id$
*/
-class LC_Page_XXX extends LC_Page_Ex
+class LC_Page_XXX extends LC_Page_Ex
{
-
- // }}}
- // {{{ functions
-
/**
* Page を初期化する.
Index: /branches/version-2_13-dev/templates/mobile_page.php
===================================================================
--- /branches/version-2_13-dev/templates/mobile_page.php (revision 22206)
+++ /branches/version-2_13-dev/templates/mobile_page.php (revision 22856)
@@ -25,10 +25,7 @@
*/
-// {{{ requires
require_once '../require.php';
require_once CLASS_EX_REALDIR . 'page_extends/XXX/LC_Page_XXX_Ex.php';
-// }}}
-// {{{ generate page
$objPage = new LC_Page_XXX_Ex();
Index: /branches/version-2_13-dev/templates/templates.xml
===================================================================
--- /branches/version-2_13-dev/templates/templates.xml (revision 22567)
+++ /branches/version-2_13-dev/templates/templates.xml (revision 22856)
@@ -22,5 +22,4 @@
*/
-// {{{ requires
require_once CLASS_EX_REALDIR . 'page_extends/LC_Page_Ex.php';
@@ -34,8 +33,4 @@
class LC_Page_XXX extends LC_Page_Ex
{
-
- // }}}
- // {{{ functions
-
/**
* Page を初期化する.
@@ -91,5 +86,4 @@
*/
-// {{{ requires
require_once CLASS_REALDIR . 'pages/XXX/LC_Page_XXX.php';
@@ -105,8 +99,4 @@
class LC_Page_XXX_Ex extends LC_Page_XXX
{
-
- // }}}
- // {{{ functions
-
/**
* Page を初期化する.
@@ -163,10 +153,7 @@
*/
- // {{{ requires
require_once './require.php';
require_once CLASS_REALDIR . 'page_extends/LC_Page_XXX_Ex.php';
-// }}}
-// {{{ generate page
$$objPage = new LC_Page_XXX_Ex();
Index: /branches/version-2_13-dev/templates/page_class_extends.php
===================================================================
--- /branches/version-2_13-dev/templates/page_class_extends.php (revision 22567)
+++ /branches/version-2_13-dev/templates/page_class_extends.php (revision 22856)
@@ -22,5 +22,4 @@
*/
-// {{{ requires
require_once CLASS_REALDIR . 'pages/XXX/LC_Page_XXX.php';
@@ -36,8 +35,4 @@
class LC_Page_XXX_Ex extends LC_Page_XXX
{
-
- // }}}
- // {{{ functions
-
/**
* Page を初期化する.
Index: /branches/version-2_13-dev/tests/class/SC_Product/SC_Product_getBuyLimitTest.php
===================================================================
--- /branches/version-2_13-dev/tests/class/SC_Product/SC_Product_getBuyLimitTest.php (revision 22567)
+++ /branches/version-2_13-dev/tests/class/SC_Product/SC_Product_getBuyLimitTest.php (revision 22856)
@@ -82,5 +82,4 @@
}
-
}
Index: /branches/version-2_13-dev/tests/class/replace/SC_Response_Ex.php
===================================================================
--- /branches/version-2_13-dev/tests/class/replace/SC_Response_Ex.php (revision 22567)
+++ /branches/version-2_13-dev/tests/class/replace/SC_Response_Ex.php (revision 22856)
@@ -47,3 +47,2 @@
}
-
Index: /branches/version-2_13-dev/tests/class/replace/SC_Display_Ex.php
===================================================================
--- /branches/version-2_13-dev/tests/class/replace/SC_Display_Ex.php (revision 22567)
+++ /branches/version-2_13-dev/tests/class/replace/SC_Display_Ex.php (revision 22856)
@@ -33,3 +33,2 @@
}
-
Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_deleteByProductIDsTest.php
===================================================================
--- /branches/version-2_13-dev/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_deleteByProductIDsTest.php (revision 22719)
+++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_deleteByProductIDsTest.php (revision 22856)
@@ -42,5 +42,4 @@
}
-
public function testDeleteByProductIDs_データが削除される(){
@@ -74,5 +73,4 @@
}
-
}
Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_saveBestProductsTest.php
===================================================================
--- /branches/version-2_13-dev/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_saveBestProductsTest.php (revision 22719)
+++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_saveBestProductsTest.php (revision 22856)
@@ -42,5 +42,4 @@
parent::tearDown();
}
-
// best_idを指定して更新される。
@@ -93,5 +92,4 @@
}
-
// best_idがnullでデータインサートされる。
public function testSaveBestProducts_ベストIDがない場合_インサートされる(){
@@ -137,7 +135,5 @@
}
-
}
-
// best_idがnull、かつrankがnullの場合、想定されたランクが登録される
Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_getBestProductsTest.php
===================================================================
--- /branches/version-2_13-dev/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_getBestProductsTest.php (revision 22719)
+++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_getBestProductsTest.php (revision 22856)
@@ -82,5 +82,4 @@
}
-
// best_idが存在するが、del_flg=1の場合、空が帰る。
public function testGetBestProducts_おすすめIDがあり_かつ削除済みの場合_空が返る(){
Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_deleteBestProductsTest.php
===================================================================
--- /branches/version-2_13-dev/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_deleteBestProductsTest.php (revision 22719)
+++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_deleteBestProductsTest.php (revision 22856)
@@ -43,5 +43,4 @@
}
-
// データが削除されていることを確認
public function testDeleteBestProducts_データが削除される(){
@@ -70,5 +69,4 @@
}
-
}
Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_getByRankTest.php
===================================================================
--- /branches/version-2_13-dev/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_getByRankTest.php (revision 22719)
+++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_getByRankTest.php (revision 22856)
@@ -82,5 +82,4 @@
}
-
// rankが存在するが、del_flg=1の場合、空が帰る。
public function testGetByRank_ランクが存在かつ_削除の場合_空が返る(){
Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_TestBase.php
===================================================================
--- /branches/version-2_13-dev/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_TestBase.php (revision 22656)
+++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_TestBase.php (revision 22856)
@@ -43,5 +43,4 @@
parent::tearDown();
}
-
/**
Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_getListTest.php
===================================================================
--- /branches/version-2_13-dev/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_getListTest.php (revision 22719)
+++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_getListTest.php (revision 22856)
@@ -146,6 +146,4 @@
}
-
-
public function testGetList_ページングが想定した結果が返る_表示件数1_ページ番号2(){
@@ -172,5 +170,4 @@
}
-
public function testGetList_ページングが想定した結果が返る_表示件数1_ページ番号0(){
Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_Address/SC_Helper_Address_getListTest.php
===================================================================
--- /branches/version-2_13-dev/tests/class/helper/SC_Helper_Address/SC_Helper_Address_getListTest.php (revision 22845)
+++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_Address/SC_Helper_Address_getListTest.php (revision 22856)
@@ -106,4 +106,3 @@
}
-
}
Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_Address/SC_Helper_Address_registAddressTest.php
===================================================================
--- /branches/version-2_13-dev/tests/class/helper/SC_Helper_Address/SC_Helper_Address_registAddressTest.php (revision 22846)
+++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_Address/SC_Helper_Address_registAddressTest.php (revision 22856)
@@ -113,6 +113,3 @@
}
-
-
-
}
Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_Address/SC_Helper_Address_getAddressTest.php
===================================================================
--- /branches/version-2_13-dev/tests/class/helper/SC_Helper_Address/SC_Helper_Address_getAddressTest.php (revision 22845)
+++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_Address/SC_Helper_Address_getAddressTest.php (revision 22856)
@@ -62,4 +62,3 @@
}
-
}
Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfMoveRankTest.php
===================================================================
--- /branches/version-2_13-dev/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfMoveRankTest.php (revision 22678)
+++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfMoveRankTest.php (revision 22856)
@@ -133,3 +133,2 @@
}
-
Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfCreateBasisDataCacheTest.php
===================================================================
--- /branches/version-2_13-dev/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfCreateBasisDataCacheTest.php (revision 22726)
+++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfCreateBasisDataCacheTest.php (revision 22856)
@@ -69,4 +69,5 @@
'company_name' => 'testshop'
);
+
return $arrData;
}
Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfDataExistsTest.php
===================================================================
--- /branches/version-2_13-dev/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfDataExistsTest.php (revision 22678)
+++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfDataExistsTest.php (revision 22856)
@@ -70,3 +70,2 @@
}
-
Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfColumnExistsTest.php
===================================================================
--- /branches/version-2_13-dev/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfColumnExistsTest.php (revision 22725)
+++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfColumnExistsTest.php (revision 22856)
@@ -85,3 +85,2 @@
}
-
Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_setShipmentItemTempForSoleTest.php
===================================================================
--- /branches/version-2_13-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_setShipmentItemTempForSoleTest.php (revision 22567)
+++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_setShipmentItemTempForSoleTest.php (revision 22856)
@@ -98,3 +98,2 @@
}
-
Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_setDownloadableFlgToTest.php
===================================================================
--- /branches/version-2_13-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_setDownloadableFlgToTest.php (revision 22567)
+++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_setDownloadableFlgToTest.php (revision 22856)
@@ -112,5 +112,4 @@
}
-
//////////////////////////////////////////
Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_saveOrderTempTest.php
===================================================================
--- /branches/version-2_13-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_saveOrderTempTest.php (revision 22567)
+++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_saveOrderTempTest.php (revision 22856)
@@ -150,3 +150,2 @@
}
-
Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_cancelOrderTest.php
===================================================================
--- /branches/version-2_13-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_cancelOrderTest.php (revision 22567)
+++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_cancelOrderTest.php (revision 22856)
@@ -183,3 +183,2 @@
}
-
Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_getKiyakuTest.php
===================================================================
--- /branches/version-2_13-dev/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_getKiyakuTest.php (revision 22721)
+++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_getKiyakuTest.php (revision 22856)
@@ -79,8 +79,3 @@
}
-
-
-
-
-
}
Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_Maker/SC_Helper_Maker_TestBase.php
===================================================================
--- /branches/version-2_13-dev/tests/class/helper/SC_Helper_Maker/SC_Helper_Maker_TestBase.php (revision 22727)
+++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_Maker/SC_Helper_Maker_TestBase.php (revision 22856)
@@ -43,5 +43,4 @@
parent::tearDown();
}
-
/**
Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_Maker/SC_Helper_Maker_getByNameTest.php
===================================================================
--- /branches/version-2_13-dev/tests/class/helper/SC_Helper_Maker/SC_Helper_Maker_getByNameTest.php (revision 22727)
+++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_Maker/SC_Helper_Maker_getByNameTest.php (revision 22856)
@@ -86,5 +86,4 @@
}
-
public function testGetByName_おすすめIDがあり_かつ削除済みの場合_空が返る(){
Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_Maker/SC_Helper_Maker_saveMakerTest.php
===================================================================
--- /branches/version-2_13-dev/tests/class/helper/SC_Helper_Maker/SC_Helper_Maker_saveMakerTest.php (revision 22727)
+++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_Maker/SC_Helper_Maker_saveMakerTest.php (revision 22856)
@@ -46,6 +46,4 @@
}
-
-
public function testSaveMaker_メーカーIDを指定すると更新される(){
//public function testSaveMaker_update(){
@@ -69,6 +67,4 @@
$this->verify();
}
-
-
public function testSaveMaker_メーカーIDがない場合_インサートされる(){
Index: /branches/version-2_13-dev/tests/class/helper/SC_Helper_Maker/SC_Helper_Maker_getMakerTest.php
===================================================================
--- /branches/version-2_13-dev/tests/class/helper/SC_Helper_Maker/SC_Helper_Maker_getMakerTest.php (revision 22727)
+++ /branches/version-2_13-dev/tests/class/helper/SC_Helper_Maker/SC_Helper_Maker_getMakerTest.php (revision 22856)
@@ -88,5 +88,4 @@
}
-
public function testGetMaker_おすすめIDがあり_かつ削除済みの場合_空が返る(){
Index: /branches/version-2_13-dev/html/contact/index.php
===================================================================
--- /branches/version-2_13-dev/html/contact/index.php (revision 22206)
+++ /branches/version-2_13-dev/html/contact/index.php (revision 22856)
@@ -21,10 +21,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-// {{{ requires
require_once '../require.php';
require_once CLASS_EX_REALDIR . 'page_extends/contact/LC_Page_Contact_Ex.php';
-// }}}
-// {{{ generate page
Index: /branches/version-2_13-dev/html/contact/complete.php
===================================================================
--- /branches/version-2_13-dev/html/contact/complete.php (revision 22206)
+++ /branches/version-2_13-dev/html/contact/complete.php (revision 22856)
@@ -22,10 +22,7 @@
*/
-// {{{ requires
require_once '../require.php';
require_once CLASS_EX_REALDIR . 'page_extends/contact/LC_Page_Contact_Complete_Ex.php';
-// }}}
-// {{{ generate page
$objPage = new LC_Page_Contact_Complete_Ex();
Index: /branches/version-2_13-dev/html/index.php
===================================================================
--- /branches/version-2_13-dev/html/index.php (revision 22206)
+++ /branches/version-2_13-dev/html/index.php (revision 22856)
@@ -21,10 +21,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-// {{{ requires
require_once './require.php';
require_once CLASS_EX_REALDIR . 'page_extends/LC_Page_Index_Ex.php';
-// }}}
-// {{{ generate page
$objPage = new LC_Page_Index_Ex();
Index: /branches/version-2_13-dev/html/guide/usage.php
===================================================================
--- /branches/version-2_13-dev/html/guide/usage.php (revision 22206)
+++ /branches/version-2_13-dev/html/guide/usage.php (revision 22856)
@@ -26,10 +26,7 @@
*/
-// {{{ requires
require_once '../require.php';
require_once CLASS_EX_REALDIR . 'page_extends/guide/LC_Page_Guide_Usage_Ex.php';
-// }}}
-// {{{ generate page
$objPage = new LC_Page_Guide_Usage_Ex();
Index: /branches/version-2_13-dev/html/guide/index.php
===================================================================
--- /branches/version-2_13-dev/html/guide/index.php (revision 22206)
+++ /branches/version-2_13-dev/html/guide/index.php (revision 22856)
@@ -26,10 +26,7 @@
*/
-// {{{ requires
require_once '../require.php';
require_once CLASS_EX_REALDIR . 'page_extends/guide/LC_Page_Guide_Ex.php';
-// }}}
-// {{{ generate page
$objPage = new LC_Page_Guide_Ex();
Index: /branches/version-2_13-dev/html/guide/charge.php
===================================================================
--- /branches/version-2_13-dev/html/guide/charge.php (revision 22206)
+++ /branches/version-2_13-dev/html/guide/charge.php (revision 22856)
@@ -26,10 +26,7 @@
*/
-// {{{ requires
require_once '../require.php';
require_once CLASS_EX_REALDIR . 'page_extends/guide/LC_Page_Guide_Charge_Ex.php';
-// }}}
-// {{{ generate page
$objPage = new LC_Page_Guide_Charge_Ex();
Index: /branches/version-2_13-dev/html/guide/about.php
===================================================================
--- /branches/version-2_13-dev/html/guide/about.php (revision 22206)
+++ /branches/version-2_13-dev/html/guide/about.php (revision 22856)
@@ -26,10 +26,7 @@
*/
-// {{{ requires
require_once '../require.php';
require_once CLASS_EX_REALDIR . 'page_extends/guide/LC_Page_Guide_About_Ex.php';
-// }}}
-// {{{ generate page
$objPage = new LC_Page_Guide_About_Ex();
Index: /branches/version-2_13-dev/html/guide/kiyaku.php
===================================================================
--- /branches/version-2_13-dev/html/guide/kiyaku.php (revision 22206)
+++ /branches/version-2_13-dev/html/guide/kiyaku.php (revision 22856)
@@ -26,10 +26,7 @@
*/
-// {{{ requires
require_once '../require.php';
require_once CLASS_EX_REALDIR . 'page_extends/guide/LC_Page_Guide_Kiyaku_Ex.php';
-// }}}
-// {{{ generate page
$objPage = new LC_Page_Guide_Kiyaku_Ex();
Index: /branches/version-2_13-dev/html/guide/privacy.php
===================================================================
--- /branches/version-2_13-dev/html/guide/privacy.php (revision 22206)
+++ /branches/version-2_13-dev/html/guide/privacy.php (revision 22856)
@@ -26,10 +26,7 @@
*/
-// {{{ requires
require_once '../require.php';
require_once CLASS_EX_REALDIR . 'page_extends/guide/LC_Page_Guide_Privacy_Ex.php';
-// }}}
-// {{{ generate page
$objPage = new LC_Page_Guide_Privacy_Ex();
Index: /branches/version-2_13-dev/html/regist/index.php
===================================================================
--- /branches/version-2_13-dev/html/regist/index.php (revision 22206)
+++ /branches/version-2_13-dev/html/regist/index.php (revision 22856)
@@ -22,10 +22,7 @@
*/
-// {{{ requires
require_once '../require.php';
require_once CLASS_EX_REALDIR . 'page_extends/regist/LC_Page_Regist_Ex.php';
-// }}}
-// {{{ generate page
$objPage = new LC_Page_Regist_Ex();
Index: /branches/version-2_13-dev/html/regist/complete.php
===================================================================
--- /branches/version-2_13-dev/html/regist/complete.php (revision 22206)
+++ /branches/version-2_13-dev/html/regist/complete.php (revision 22856)
@@ -22,10 +22,7 @@
*/
-// {{{ requires
require_once '../require.php';
require_once CLASS_EX_REALDIR . 'page_extends/regist/LC_Page_Regist_Complete_Ex.php';
-// }}}
-// {{{ generate page
$objPage = new LC_Page_Regist_Complete_Ex();
Index: /branches/version-2_13-dev/html/abouts/index.php
===================================================================
--- /branches/version-2_13-dev/html/abouts/index.php (revision 22206)
+++ /branches/version-2_13-dev/html/abouts/index.php (revision 22856)
@@ -22,10 +22,7 @@
*/
-// {{{ requires
require_once '../require.php';
require_once CLASS_EX_REALDIR . 'page_extends/abouts/LC_Page_Abouts_Ex.php';
-// }}}
-// {{{ generate page
$objPage = new LC_Page_Abouts_Ex();
Index: /branches/version-2_13-dev/html/entry/index.php
===================================================================
--- /branches/version-2_13-dev/html/entry/index.php (revision 22206)
+++ /branches/version-2_13-dev/html/entry/index.php (revision 22856)
@@ -22,10 +22,7 @@
*/
-// {{{ requires
require_once '../require.php';
require_once CLASS_EX_REALDIR . 'page_extends/entry/LC_Page_Entry_Ex.php';
-// }}}
-// {{{ generate page
$objPage = new LC_Page_Entry_Ex();
Index: /branches/version-2_13-dev/html/entry/complete.php
===================================================================
--- /branches/version-2_13-dev/html/entry/complete.php (revision 22206)
+++ /branches/version-2_13-dev/html/entry/complete.php (revision 22856)
@@ -22,10 +22,7 @@
*/
-// {{{ requires
require_once '../require.php';
require_once CLASS_EX_REALDIR . 'page_extends/entry/LC_Page_Entry_Complete_Ex.php';
-// }}}
-// {{{ generate page
$objPage = new LC_Page_Entry_Complete_Ex();
Index: /branches/version-2_13-dev/html/entry/kiyaku.php
===================================================================
--- /branches/version-2_13-dev/html/entry/kiyaku.php (revision 22206)
+++ /branches/version-2_13-dev/html/entry/kiyaku.php (revision 22856)
@@ -22,10 +22,7 @@
*/
-// {{{ requires
require_once '../require.php';
require_once CLASS_EX_REALDIR . 'page_extends/entry/LC_Page_Entry_Kiyaku_Ex.php';
-// }}}
-// {{{ generate page
$objPage = new LC_Page_Entry_Kiyaku_Ex();
Index: /branches/version-2_13-dev/html/entry/email_mobile.php
===================================================================
--- /branches/version-2_13-dev/html/entry/email_mobile.php (revision 22206)
+++ /branches/version-2_13-dev/html/entry/email_mobile.php (revision 22856)
@@ -26,10 +26,7 @@
*/
-// {{{ requires
require_once '../require.php';
require_once CLASS_EX_REALDIR . 'page_extends/entry/LC_Page_Entry_EmailMobile_Ex.php';
-// }}}
-// {{{ generate page
$objPage = new LC_Page_Entry_EmailMobile_Ex();
Index: /branches/version-2_13-dev/html/frontparts/login_check.php
===================================================================
--- /branches/version-2_13-dev/html/frontparts/login_check.php (revision 22206)
+++ /branches/version-2_13-dev/html/frontparts/login_check.php (revision 22856)
@@ -22,10 +22,7 @@
*/
-// {{{ requires
require_once '../require.php';
require_once CLASS_EX_REALDIR . 'page_extends/frontparts/LC_Page_FrontParts_LoginCheck_Ex.php';
-// }}}
-// {{{ generate page
$objPage = new LC_Page_FrontParts_LoginCheck_Ex();
Index: /branches/version-2_13-dev/html/frontparts/bloc/login_header.php
===================================================================
--- /branches/version-2_13-dev/html/frontparts/bloc/login_header.php (revision 22206)
+++ /branches/version-2_13-dev/html/frontparts/bloc/login_header.php (revision 22856)
@@ -22,10 +22,7 @@
*/
-// {{{ requires
require_once realpath(dirname(__FILE__)) . '/../../require.php';
require_once CLASS_EX_REALDIR . 'page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_LoginHeader_Ex.php';
-// }}}
-// {{{ generate page
$objPage = new LC_Page_FrontParts_BLoc_LoginHeader_Ex();
$objPage->blocItems = $params['items'];
Index: /branches/version-2_13-dev/html/frontparts/bloc/navi_header.php
===================================================================
--- /branches/version-2_13-dev/html/frontparts/bloc/navi_header.php (revision 22206)
+++ /branches/version-2_13-dev/html/frontparts/bloc/navi_header.php (revision 22856)
@@ -22,10 +22,7 @@
*/
-// {{{ requires
require_once realpath(dirname(__FILE__)) . '/../../require.php';
require_once CLASS_EX_REALDIR . 'page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_NaviHeader_Ex.php';
-// }}}
-// {{{ generate page
$objPage = new LC_Page_FrontParts_BLoc_NaviHeader_Ex();
$objPage->blocItems = $params['items'];
Index: /branches/version-2_13-dev/html/frontparts/bloc/login_footer.php
===================================================================
--- /branches/version-2_13-dev/html/frontparts/bloc/login_footer.php (revision 22206)
+++ /branches/version-2_13-dev/html/frontparts/bloc/login_footer.php (revision 22856)
@@ -22,10 +22,7 @@
*/
-// {{{ requires
require_once realpath(dirname(__FILE__)) . '/../../require.php';
require_once CLASS_EX_REALDIR . 'page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_LoginFooter_Ex.php';
-// }}}
-// {{{ generate page
$objPage = new LC_Page_FrontParts_BLoc_LoginFooter_Ex();
$objPage->blocItems = $params['items'];
Index: /branches/version-2_13-dev/html/frontparts/bloc/login.php
===================================================================
--- /branches/version-2_13-dev/html/frontparts/bloc/login.php (revision 22206)
+++ /branches/version-2_13-dev/html/frontparts/bloc/login.php (revision 22856)
@@ -22,10 +22,7 @@
*/
-// {{{ requires
require_once realpath(dirname(__FILE__)) . '/../../require.php';
require_once CLASS_EX_REALDIR . 'page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_Login_Ex.php';
-// }}}
-// {{{ generate page
$objPage = new LC_Page_FrontParts_BLoc_Login_Ex();
$objPage->blocItems = $params['items'];
Index: /branches/version-2_13-dev/html/frontparts/bloc/search_products.php
===================================================================
--- /branches/version-2_13-dev/html/frontparts/bloc/search_products.php (revision 22206)
+++ /branches/version-2_13-dev/html/frontparts/bloc/search_products.php (revision 22856)
@@ -21,10 +21,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-// {{{ requires
require_once realpath(dirname(__FILE__)) . '/../../require.php';
require_once CLASS_EX_REALDIR . 'page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_SearchProducts_Ex.php';
-// }}}
-// {{{ generate page
$objPage = new LC_Page_FrontParts_BLoc_SearchProducts_Ex();
Index: /branches/version-2_13-dev/html/frontparts/bloc/calendar.php
===================================================================
--- /branches/version-2_13-dev/html/frontparts/bloc/calendar.php (revision 22206)
+++ /branches/version-2_13-dev/html/frontparts/bloc/calendar.php (revision 22856)
@@ -22,10 +22,7 @@
*/
-// {{{ requires
require_once realpath(dirname(__FILE__)) . '/../../require.php';
require_once CLASS_EX_REALDIR . 'page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar_Ex.php';
-// }}}
-// {{{ generate page
$objPage = new LC_Page_FrontParts_Bloc_Calendar_Ex();
Index: /branches/version-2_13-dev/html/frontparts/bloc/cart.php
===================================================================
--- /branches/version-2_13-dev/html/frontparts/bloc/cart.php (revision 22206)
+++ /branches/version-2_13-dev/html/frontparts/bloc/cart.php (revision 22856)
@@ -22,10 +22,7 @@
*/
-// {{{ requires
require_once realpath(dirname(__FILE__)) . '/../../require.php';
require_once CLASS_EX_REALDIR . 'page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_Cart_Ex.php';
-// }}}
-// {{{ generate page
$objPage = new LC_Page_FrontParts_BLoc_Cart_Ex();
Index: /branches/version-2_13-dev/html/frontparts/bloc/recommend.php
===================================================================
--- /branches/version-2_13-dev/html/frontparts/bloc/recommend.php (revision 22206)
+++ /branches/version-2_13-dev/html/frontparts/bloc/recommend.php (revision 22856)
@@ -22,10 +22,7 @@
*/
-// {{{ requires
require_once realpath(dirname(__FILE__)) . '/../../require.php';
require_once CLASS_EX_REALDIR . 'page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_Recommend_Ex.php';
-// }}}
-// {{{ generate page
$objPage = new LC_Page_FrontParts_BLoc_Recommend_Ex();
Index: /branches/version-2_13-dev/html/frontparts/bloc/navi_footer.php
===================================================================
--- /branches/version-2_13-dev/html/frontparts/bloc/navi_footer.php (revision 22206)
+++ /branches/version-2_13-dev/html/frontparts/bloc/navi_footer.php (revision 22856)
@@ -22,10 +22,7 @@
*/
-// {{{ requires
require_once realpath(dirname(__FILE__)) . '/../../require.php';
require_once CLASS_EX_REALDIR . 'page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_NaviFooter_Ex.php';
-// }}}
-// {{{ generate page
$objPage = new LC_Page_FrontParts_BLoc_NaviFooter_Ex();
$objPage->blocItems = $params['items'];
Index: /branches/version-2_13-dev/html/frontparts/bloc/news.php
===================================================================
--- /branches/version-2_13-dev/html/frontparts/bloc/news.php (revision 22206)
+++ /branches/version-2_13-dev/html/frontparts/bloc/news.php (revision 22856)
@@ -21,10 +21,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-// {{{ requires
require_once realpath(dirname(__FILE__)) . '/../../require.php';
require_once CLASS_EX_REALDIR . 'page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_News_Ex.php';
-// }}}
-// {{{ generate page
$objPage = new LC_Page_FrontParts_BLoc_News_Ex();
Index: /branches/version-2_13-dev/html/frontparts/bloc/category.php
===================================================================
--- /branches/version-2_13-dev/html/frontparts/bloc/category.php (revision 22206)
+++ /branches/version-2_13-dev/html/frontparts/bloc/category.php (revision 22856)
@@ -22,10 +22,7 @@
*/
-// {{{ requires
require_once realpath(dirname(__FILE__)) . '/../../require.php';
require_once CLASS_EX_REALDIR . 'page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_Category_Ex.php';
-// }}}
-// {{{ generate page
$objPage = new LC_Page_FrontParts_BLoc_Category_Ex();
Index: /branches/version-2_13-dev/html/install/index.php
===================================================================
--- /branches/version-2_13-dev/html/install/index.php (revision 22843)
+++ /branches/version-2_13-dev/html/install/index.php (revision 22856)
@@ -720,5 +720,4 @@
function lfInitDBParam($objDBParam)
{
-
if (defined('DB_SERVER')) {
$db_server = DB_SERVER;
@@ -898,5 +897,4 @@
// 接続エラー
if (!PEAR::isError($objDB)) {
-
$exists = $objManager->listSequences();
foreach ($arrSequences as $seq) {
@@ -938,5 +936,4 @@
// 接続エラー
if (!PEAR::isError($objDB)) {
-
$exists = $objManager->listSequences();
foreach ($arrSequences as $seq) {
@@ -1126,5 +1123,4 @@
}
-
/**
* 管理機能のディレクトリ名の変更
Index: /branches/version-2_13-dev/html/install/templates/step2.tpl
===================================================================
--- /branches/version-2_13-dev/html/install/templates/step2.tpl (revision 22206)
+++ /branches/version-2_13-dev/html/install/templates/step2.tpl (revision 22856)
@@ -22,5 +22,4 @@
|