[xoops-cvslog 2726] CVS update: xoops2jp/html/modules/base/admin/forms

アーカイブの一覧に戻る

Minahito minah****@users*****
2006年 4月 11日 (火) 14:41:58 JST


Index: xoops2jp/html/modules/base/admin/forms/BlockInstallFilterForm.class.php
diff -u xoops2jp/html/modules/base/admin/forms/BlockInstallFilterForm.class.php:1.1.2.2 xoops2jp/html/modules/base/admin/forms/BlockInstallFilterForm.class.php:1.1.2.3
--- xoops2jp/html/modules/base/admin/forms/BlockInstallFilterForm.class.php:1.1.2.2	Thu Apr  6 15:11:37 2006
+++ xoops2jp/html/modules/base/admin/forms/BlockInstallFilterForm.class.php	Tue Apr 11 14:41:58 2006
@@ -4,7 +4,6 @@
 
 require_once XOOPS_MODULE_PATH . "/base/class/AbstractFilterForm.class.php";
 
-define('NEWBLOCKS_SORT_KEY_DEFAULT', 0);
 define('NEWBLOCKS_SORT_KEY_BID', 1);
 define('NEWBLOCKS_SORT_KEY_MID', 2);
 define('NEWBLOCKS_SORT_KEY_FUNC_NUM', 3);
@@ -27,6 +26,8 @@
 define('NEWBLOCKS_SORT_KEY_LAST_MODIFIED', 20);
 define('NEWBLOCKS_SORT_KEY_MAXVALUE', 20);
 
+define('NEWBLOCKS_SORT_KEY_DEFAULT', NEWBLOCKS_SORT_KEY_MID);
+
 class Legacy_BlockInstallFilterForm extends Legacy_AbstractFilterForm
 {
 	var $mSort = 0;
@@ -57,7 +58,7 @@
 
 	function fetch()
 	{
-		$this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : 0;
+		$this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : NEWBLOCKS_SORT_KEY_DEFAULT;
 	
 		if ($this->mSort > NEWBLOCKS_SORT_KEY_MAXVALUE) {
 			$this->mSort = NEWBLOCKS_SORT_KEY_DEFAULT;
Index: xoops2jp/html/modules/base/admin/forms/BlockFilterForm.class.php
diff -u xoops2jp/html/modules/base/admin/forms/BlockFilterForm.class.php:1.1.2.2 xoops2jp/html/modules/base/admin/forms/BlockFilterForm.class.php:1.1.2.3
--- xoops2jp/html/modules/base/admin/forms/BlockFilterForm.class.php:1.1.2.2	Thu Apr  6 15:11:32 2006
+++ xoops2jp/html/modules/base/admin/forms/BlockFilterForm.class.php	Tue Apr 11 14:41:58 2006
@@ -4,7 +4,6 @@
 
 require_once XOOPS_MODULE_PATH . "/base/class/AbstractFilterForm.class.php";
 
-define('NEWBLOCKS_SORT_KEY_DEFAULT', 0);
 define('NEWBLOCKS_SORT_KEY_BID', 1);
 define('NEWBLOCKS_SORT_KEY_MID', 2);
 define('NEWBLOCKS_SORT_KEY_FUNC_NUM', 3);
@@ -27,11 +26,12 @@
 define('NEWBLOCKS_SORT_KEY_LAST_MODIFIED', 20);
 define('NEWBLOCKS_SORT_KEY_MAXVALUE', 20);
 
+define('NEWBLOCKS_SORT_KEY_DEFAULT', NEWBLOCKS_SORT_KEY_SIDE);
+
 class Legacy_BlockFilterForm extends Legacy_AbstractFilterForm
 {
 	var $mSort = 0;
 	var $_mSortKeys = array(
-		NEWBLOCKS_SORT_KEY_DEFAULT => 'bid',
 		NEWBLOCKS_SORT_KEY_BID => 'bid',
 		NEWBLOCKS_SORT_KEY_MID => 'mid',
 		NEWBLOCKS_SORT_KEY_FUNC_NUM => 'func_num',
@@ -57,7 +57,7 @@
 
 	function fetch()
 	{
-		$this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : 0;
+		$this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : NEWBLOCKS_SORT_KEY_DEFAULT;
 	
 		if ($this->mSort > NEWBLOCKS_SORT_KEY_MAXVALUE) {
 			$this->mSort = NEWBLOCKS_SORT_KEY_DEFAULT;


xoops-cvslog メーリングリストの案内
アーカイブの一覧に戻る