Fixed bug #12119: PHP warning shown in EM, if webserver can't remove extension dir...
authorSteffen Kamper <info@sk-typo3.de>
Fri, 9 Oct 2009 16:32:55 +0000 (16:32 +0000)
committerSteffen Kamper <info@sk-typo3.de>
Fri, 9 Oct 2009 16:32:55 +0000 (16:32 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@6128 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/mod/tools/em/class.em_index.php

index c3bb918..3eb593e 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-10-09  Steffen Kamper  <info@sk-typo3.de>
+
+       * Fixed bug #12119: PHP warning shown in EM, if webserver can't remove extension dir (thanks to Steffen Gebert)
+
 2009-10-09  Oliver Hader  <oliver@typo3.org>
 
        * Follow-up to issue #12162: Reverted modification of existing locallang labels and introduced new labels instead
index 8f44962..91d5110 100644 (file)
@@ -4354,7 +4354,7 @@ EXTENSION KEYS:
                                foreach($remDirs as $removeRelDir)      {
                                        $removeDir = $removePath.$removeRelDir;
                                        if (@is_dir($removeDir))        {
-                                               rmdir($removeDir);
+                                               @rmdir($removeDir);
                                                clearstatcache();
                                                if (@is_dir($removeDir))        {
                                                        $errors[] = sprintf($GLOBALS['LANG']->getLL('rmExtDir_error_files_left'),
@@ -4368,7 +4368,7 @@ EXTENSION KEYS:
 
                                // If extension dir should also be removed:
                                if (!$removeContentOnly)        {
-                                       rmdir($removePath);
+                                       @rmdir($removePath);
                                        clearstatcache();
                                        if (@is_dir($removePath))       {
                                                $errors[] = sprintf($GLOBALS['LANG']->getLL('rmExtDir_error_folders_left'),