Minahito
minah****@users*****
2006年 5月 17日 (水) 16:21:27 JST
Index: xoops2jp/html/modules/legacyRender/admin/forms/TplfileFilterForm.class.php
diff -u xoops2jp/html/modules/legacyRender/admin/forms/TplfileFilterForm.class.php:1.1.2.6 xoops2jp/html/modules/legacyRender/admin/forms/TplfileFilterForm.class.php:1.1.2.7
--- xoops2jp/html/modules/legacyRender/admin/forms/TplfileFilterForm.class.php:1.1.2.6 Tue Mar 28 22:30:48 2006
+++ xoops2jp/html/modules/legacyRender/admin/forms/TplfileFilterForm.class.php Wed May 17 16:21:27 2006
@@ -2,7 +2,6 @@
if (!defined('XOOPS_ROOT_PATH')) exit();
-define('TPLFILE_SORT_KEY_DEFAULT', 0);
define('TPLFILE_SORT_KEY_TPL_ID', 1);
define('TPLFILE_SORT_KEY_TPL_REFID', 2);
define('TPLFILE_SORT_KEY_TPL_MODULE', 3);
@@ -14,6 +13,8 @@
define('TPLFILE_SORT_KEY_TPL_TYPE', 9);
define('TPLFILE_SORT_KEY_MAXVALUE', 9);
+define('TPLFILE_SORT_KEY_DEFAULT', TPLFILE_SORT_KEY_TPL_ID);
+
class LegacyRender_TplfileFilterForm
{
var $mSort = 0;
@@ -47,7 +48,7 @@
function fetch()
{
- $this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : 0;
+ $this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : TPLFILE_SORT_KEY_DEFAULT;
if (abs($this->mSort) > TPLFILE_SORT_KEY_MAXVALUE) {
$this->mSort = TPLFILE_SORT_KEY_DEFAULT;
@@ -63,7 +64,13 @@
if (isset($_REQUEST['tpl_tplset'])) {
$this->_mNavi->addExtra('tpl_tplset', xoops_getrequest('tpl_tplset'));
- $this->_mCriteria->add(new Criteria('tpl_tplset', array(XOBJ_DTYPE_STRING, xoops_getrequest('tpl_tplset'))));
+
+ //
+ // For the procedure of override, must load 'default' template-set here.
+ // The template of the specified template-set will be loaded in Tplset Object.
+ // See business-logic.
+ //
+ $this->_mCriteria->add(new Criteria('tpl_tplset', 'default'));
$handler =& xoops_getmodulehandler('tplset');
$tplsets =& $handler->getObjects(new Criteria('tplset_name', xoops_getrequest('tpl_tplset')));