Minahito
minah****@users*****
2007年 3月 16日 (金) 20:31:18 JST
Index: xoops2jp/html/modules/legacy/admin/class/ModuleUninstaller.class.php
diff -u xoops2jp/html/modules/legacy/admin/class/ModuleUninstaller.class.php:1.1.2.12 xoops2jp/html/modules/legacy/admin/class/ModuleUninstaller.class.php:1.1.2.12.2.1
--- xoops2jp/html/modules/legacy/admin/class/ModuleUninstaller.class.php:1.1.2.12 Fri Dec 8 23:42:11 2006
+++ xoops2jp/html/modules/legacy/admin/class/ModuleUninstaller.class.php Fri Mar 16 20:31:18 2007
@@ -19,6 +19,7 @@
/**
* @protected
* @var XoopsModule
+ * @remark [Precondition] _mXoopsModule has to be an object.
*/
var $_mXoopsModule = null;
@@ -165,12 +166,7 @@
$this->mLog->add(XCube_Utils::formatMessage(_AD_LEGACY_MESSAGE_UNINSTALLATION_MODULE_SUCCESSFUL, $this->_mXoopsModule->get('name')));
}
else {
- if (is_object($this->_mXoopsModule)) {
- $this->mLog->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_UNINSTALLATION_MODULE_FAILURE, $this->_mXoopsModule->get('name')));
- }
- else {
- $this->mLog->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_UNINSTALLATION_MODULE_FAILURE, $this->_mXoopsModule->get('dirname')));
- }
+ $this->mLog->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_UNINSTALLATION_MODULE_FAILURE, $this->_mXoopsModule->get('name')));
}
}
Index: xoops2jp/html/modules/legacy/admin/class/ModuleInstaller.class.php
diff -u xoops2jp/html/modules/legacy/admin/class/ModuleInstaller.class.php:1.1.2.9.2.1 xoops2jp/html/modules/legacy/admin/class/ModuleInstaller.class.php:1.1.2.9.2.2
--- xoops2jp/html/modules/legacy/admin/class/ModuleInstaller.class.php:1.1.2.9.2.1 Wed Mar 14 12:52:28 2007
+++ xoops2jp/html/modules/legacy/admin/class/ModuleInstaller.class.php Fri Mar 16 20:31:18 2007
@@ -1,7 +1,7 @@
<?php
/**
* @package Legacy
- * @version $Id: ModuleInstaller.class.php,v 1.1.2.9.2.1 2007/03/14 03:52:28 minahito Exp $
+ * @version $Id: ModuleInstaller.class.php,v 1.1.2.9.2.2 2007/03/16 11:31:18 minahito Exp $
*/
if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -26,6 +26,7 @@
/**
* @var XoopsModule
+ * @remark [Precondition] _mXoopsModule has to be an object.
*/
var $_mXoopsModule = null;
@@ -209,13 +210,7 @@
$this->mLog->add(XCube_Utils::formatMessage(_AD_LEGACY_MESSAGE_INSTALLATION_MODULE_SUCCESSFUL, $this->_mXoopsModule->get('name')));
}
else {
- if (is_object($this->_mXoopsModule)) {
- $this->mLog->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_INSTALLATION_MODULE_FAILURE, $this->_mXoopsModule->get('name')));
- }
- else {
- // exception: This code is not used, because Legacy_ModuleInstallAction::prepare() kicks such case before.
- $this->mLog->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_INSTALLATION_MODULE_FAILURE, "something"));
- }
+ $this->mLog->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_INSTALLATION_MODULE_FAILURE, $this->_mXoopsModule->get('name')));
}
}
Index: xoops2jp/html/modules/legacy/admin/class/ModuleUpdater.class.php
diff -u xoops2jp/html/modules/legacy/admin/class/ModuleUpdater.class.php:1.1.2.16.2.1 xoops2jp/html/modules/legacy/admin/class/ModuleUpdater.class.php:1.1.2.16.2.2
--- xoops2jp/html/modules/legacy/admin/class/ModuleUpdater.class.php:1.1.2.16.2.1 Wed Mar 14 15:44:06 2007
+++ xoops2jp/html/modules/legacy/admin/class/ModuleUpdater.class.php Fri Mar 16 20:31:18 2007
@@ -1,7 +1,7 @@
<?php
/**
* @package Legacy
- * @version $Id: ModuleUpdater.class.php,v 1.1.2.16.2.1 2007/03/14 06:44:06 minahito Exp $
+ * @version $Id: ModuleUpdater.class.php,v 1.1.2.16.2.2 2007/03/16 11:31:18 minahito Exp $
*/
if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -65,6 +65,7 @@
/**
* @var XoopsModule
+ * @remark [Precondition] _mXoopsModule has to be an object.
*/
var $_mCurrentXoopsModule;
@@ -75,6 +76,7 @@
/**
* @var XoopsModule
+ * @remark [Precondition] _mXoopsModule has to be an object.
*/
var $_mTargetXoopsModule;