NobuNobu
nobun****@users*****
2006年 12月 8日 (金) 23:42:11 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.11 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.11 Mon Nov 20 15:20:08 2006
+++ xoops2jp/html/modules/legacy/admin/class/ModuleUninstaller.class.php Fri Dec 8 23:42:11 2006
@@ -184,37 +184,37 @@
$this->_processReport();
return false;
}
+ if ($this->_mXoopsModule->get('mid') != null) {
+ $this->_uninstallModule();
+ if (!$this->_mForceMode && $this->mLog->hasError()) {
+ $this->_processReport();
+ return false;
+ }
- $this->_uninstallModule();
- if (!$this->_mForceMode && $this->mLog->hasError()) {
- $this->_processReport();
- return false;
- }
-
- $this->_uninstallTemplates();
- if (!$this->_mForceMode && $this->mLog->hasError()) {
- $this->_processReport();
- return false;
- }
+ $this->_uninstallTemplates();
+ if (!$this->_mForceMode && $this->mLog->hasError()) {
+ $this->_processReport();
+ return false;
+ }
- $this->_uninstallBlocks();
- if (!$this->_mForceMode && $this->mLog->hasError()) {
- $this->_processReport();
- return false;
- }
-
- $this->_uninstallPreferences();
- if (!$this->_mForceMode && $this->mLog->hasError()) {
- $this->_processReport();
- return false;
- }
-
- $this->_processScript();
- if (!$this->_mForceMode && $this->mLog->hasError()) {
- $this->_processReport();
- return false;
+ $this->_uninstallBlocks();
+ if (!$this->_mForceMode && $this->mLog->hasError()) {
+ $this->_processReport();
+ return false;
+ }
+
+ $this->_uninstallPreferences();
+ if (!$this->_mForceMode && $this->mLog->hasError()) {
+ $this->_processReport();
+ return false;
+ }
+
+ $this->_processScript();
+ if (!$this->_mForceMode && $this->mLog->hasError()) {
+ $this->_processReport();
+ return false;
+ }
}
-
$this->_processReport();
return true;