Fixed bug #12195: Renaming write protected file issues a php warning
[Packages/TYPO3.CMS.git] / t3lib / class.t3lib_extfilefunc.php
index 4381e98..5b5b2f4 100644 (file)
@@ -574,7 +574,7 @@ class t3lib_extFileFunctions extends t3lib_basicFileFunctions       {
                                                if ($this->checkIfAllowed($fI['fileext'], $theDest, $fI['file'])) {
                                                        if ($this->checkPathAgainstMounts($theDestFile) && $this->checkPathAgainstMounts($theFile))     {
                                                                if ($this->PHPFileFunctions)    {
-                                                                       rename($theFile, $theDestFile);
+                                                                       @rename($theFile, $theDestFile);
                                                                } else {
                                                                        $cmd = 'mv "'.$theFile.'" "'.$theDestFile.'"';
                                                                        exec($cmd);
@@ -607,7 +607,7 @@ class t3lib_extFileFunctions extends t3lib_basicFileFunctions       {
                                                        if ($this->checkIfFullAccess($theDest) || $this->is_webPath($theDestFile)==$this->is_webPath($theFile)) {       // // no moving of folders between spaces
                                                                if ($this->checkPathAgainstMounts($theDestFile) && $this->checkPathAgainstMounts($theFile))     {
                                                                        if ($this->PHPFileFunctions)    {
-                                                                               rename($theFile, $theDestFile);
+                                                                               @rename($theFile, $theDestFile);
                                                                        } else {
                                                                                $cmd = 'mv "'.$theFile.'" "'.$theDestFile.'"';
                                                                                $errArr = array();
@@ -688,7 +688,7 @@ class t3lib_extFileFunctions extends t3lib_basicFileFunctions       {
                if (!$this->isInit) return FALSE;
 
                $theFolder = $this->cleanFileName($cmds['data']);
-               if (isset($theFolder) {
+               if (isset($theFolder) && trim($theFolder) != '') {
                        if ($this->checkFileNameLen($theFolder))        {
                                $theTarget = $this->is_directory($cmds['target']);      // Check the target dir
                                if ($theTarget) {