Minahito
minah****@users*****
2006年 2月 4日 (土) 01:00:31 JST
Index: xoops2jp/html/modules/base/admin/actions/AbstractModuleInstallAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/AbstractModuleInstallAction.class.php:1.1.2.5 xoops2jp/html/modules/base/admin/actions/AbstractModuleInstallAction.class.php:1.1.2.6
--- xoops2jp/html/modules/base/admin/actions/AbstractModuleInstallAction.class.php:1.1.2.5 Thu Feb 2 21:05:26 2006
+++ xoops2jp/html/modules/base/admin/actions/AbstractModuleInstallAction.class.php Sat Feb 4 01:00:31 2006
@@ -51,22 +51,21 @@
$this->mActionForm->fetch();
$this->mActionForm->validate();
- if ($this->mActionForm->hasError()) {
- return LEGACY_FRAME_VIEW_INPUT;
- }
-
$installer =& $this->_getInstaller($this->mActionForm->get('dirname'));
$this->mModuleObject =& $installer->loadModuleObject($this->mActionForm->get('dirname'));
- if (!is_object($this->mModuleObject)) {
- return LEGACY_FRAME_VIEW_ERROR;
+ if ($installer->hasAgree()) {
+ $this->_loadAgreement();
}
- if ($installer->hasAgree() && !$this->mActionForm->get('agree')) {
- $this->_loadAgreement();
+ if ($this->mActionForm->hasError()) {
return LEGACY_FRAME_VIEW_INPUT;
}
+ if (!is_object($this->mModuleObject)) {
+ return LEGACY_FRAME_VIEW_ERROR;
+ }
+
$installer->setForceMode($this->mActionForm->get('force'));
$installer->execute($this->mActionForm->get('dirname'));
@@ -88,7 +87,7 @@
function executeViewIndex(&$controller,&$xoopsUser,&$renderer)
{
- $renderer->setTemplateName("module_installers_error.html");
+ $renderer->setTemplateName("install_wizard_error.html");
$renderer->setAttribute('log', $this->mLog);
}
}