* Fixed bug #79: Extension manager: Removing extensions containing empty folders...
authorIngmar Schlecht <ingmar.schlecht@typo3.org>
Mon, 12 Jul 2004 09:37:32 +0000 (09:37 +0000)
committerIngmar Schlecht <ingmar.schlecht@typo3.org>
Mon, 12 Jul 2004 09:37:32 +0000 (09:37 +0000)
* Fixed bug: When removing an extension, typo3 tried to remove the extension directory twice

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@408 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/mod/tools/em/index.php

index 4f6af13..60fde86 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-12  Ingmar Schlecht  <ingmars@web.de>
+
+       * Fixed bug #79: Extension manager: Removing extensions containing empty folders did not work
+       * Fixed bug: When removing an extension, typo3 tried to remove the extension directory twice
+
 2004-07-02  Michael Stucki  <mundaun@gmx.ch>
 
        * Fixed bug #0000191: Small typo in German translation
index 504feb6..7fc0901 100755 (executable)
@@ -1645,7 +1645,6 @@ EXTENSION KEYS:
                                        return 'ERROR: Could not remove extension directory "'.$absPath.'". Had the following errors:<br /><br />'.
                                                                nl2br($res);
                                } else {
-                                       rmdir($absPath);
                                        return 'Removed extension in path "'.$absPath.'"!';
                                }
                        } else {
@@ -2863,7 +2862,7 @@ EXTENSION KEYS:
                        ) {
 
                                // All files in extension directory:
-                       $fileArr = t3lib_div::getAllFilesAndFoldersInPath(array(),$removePath);
+                       $fileArr = t3lib_div::getAllFilesAndFoldersInPath(array(),$removePath,'',1);
                        if (is_array($fileArr)) {
 
                                        // Remove files in dirs: