Minahito
minah****@users*****
2006年 8月 13日 (日) 15:04:56 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.9 xoops2jp/html/modules/base/admin/actions/AbstractModuleInstallAction.class.php:1.1.2.10
--- xoops2jp/html/modules/base/admin/actions/AbstractModuleInstallAction.class.php:1.1.2.9 Tue Aug 1 19:27:20 2006
+++ xoops2jp/html/modules/base/admin/actions/AbstractModuleInstallAction.class.php Sun Aug 13 15:04:56 2006
@@ -1,7 +1,7 @@
<?php
/**
* @package Legacy
- * @version $Id: AbstractModuleInstallAction.class.php,v 1.1.2.9 2006/08/01 10:27:20 minahito Exp $
+ * @version $Id: AbstractModuleInstallAction.class.php,v 1.1.2.10 2006/08/13 06:04:56 minahito Exp $
*/
if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -67,7 +67,16 @@
}
if ($this->mActionForm->hasError()) {
- return LEGACY_FRAME_VIEW_INPUT;
+ //
+ // Normal modules doesn't have licence.txt. If it has licence.txt
+ // return 'INPUT' view.
+ //
+ if ($installer->hasAgree()) {
+ return LEGACY_FRAME_VIEW_INPUT;
+ }
+ else {
+ return LEGACY_FRAME_VIEW_INDEX;
+ }
}
if (!is_object($this->mModuleObject)) {