Minahito
minah****@users*****
2006年 5月 15日 (月) 12:13:10 JST
Index: xoops2jp/html/modules/base/admin/actions/PreferenceEditAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/PreferenceEditAction.class.php:1.1.2.1 xoops2jp/html/modules/base/admin/actions/PreferenceEditAction.class.php:1.1.2.2
--- xoops2jp/html/modules/base/admin/actions/PreferenceEditAction.class.php:1.1.2.1 Fri May 12 19:13:36 2006
+++ xoops2jp/html/modules/base/admin/actions/PreferenceEditAction.class.php Mon May 15 12:13:10 2006
@@ -7,6 +7,8 @@
class Legacy_PreferenceEditAction extends Legacy_Action
{
var $mPreparedFlag = false;
+
+ var $mCategory = null;
var $mObjects = array();
var $mActionForm = null;
@@ -68,6 +70,8 @@
$render->setAttribute('actionForm', $this->mActionForm);
$render->setAttribute('objectArr', $this->mObjects);
+ $render->setAttribute('category', $this->mCategory);
+
$handler =& xoops_gethandler('timezone');
$timezoneArr =& $handler->getObjects();
$render->setAttribute('timezoneArr', $timezoneArr);
@@ -149,11 +153,11 @@
class Legacy_AbstractPreferenceEditState
{
- var $mMaster = null;
+ var $_mMaster = null;
function Legacy_AbstractPreferenceEditState(&$master)
{
- $this->mMaster =& $master;
+ $this->_mMaster =& $master;
}
function prepare(&$controller, &$xoopsUser)
@@ -166,15 +170,15 @@
function prepare(&$controller, &$xoopsUser)
{
$handler =& xoops_gethandler('configcategory');
- $category =& $handler->get(intval(xoops_getrequest('confcat_id')));
+ $this->_mMaster->mCategory =& $handler->get(intval(xoops_getrequest('confcat_id')));
- if (!is_object($category)) {
+ if (!is_object($this->_mMaster->mCategory)) {
return;
}
- $this->mMaster->mActionForm =& new Legacy_PreferenceEditForm($category);
+ $this->_mMaster->mActionForm =& new Legacy_PreferenceEditForm($category);
- $this->mMaster->mPreparedFlag = true;
+ $this->_mMaster->mPreparedFlag = true;
}
}
@@ -189,9 +193,9 @@
return;
}
- $this->mMaster->mActionForm =& new Legacy_ModulePreferenceEditForm($module);
+ $this->_mMaster->mActionForm =& new Legacy_ModulePreferenceEditForm($module);
- $this->mMaster->mPreparedFlag = true;
+ $this->_mMaster->mPreparedFlag = true;
}
}