deploy: 38bb986

FriendsOfREDAXO · Feb 27, 2024 · bc43b8c · bc43b8c
1 parent 8563407
commit bc43b8c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/classes/rex-file.html b/classes/rex-file.html
@@ -497,9 +497,9 @@ <h4 class="phpdocumentor-element__name" id="method_delete">
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="redaxo-main/redaxo/src/core/lib/util/file.php"><a href="files/redaxo-main-redaxo-src-core-lib-util-file.html"><abbr title="redaxo-main/redaxo/src/core/lib/util/file.php">file.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">230</span>
+    <span class="phpdocumentor-element-found-in__line">236</span>
 
-            <a href="classes/rex-file.html#source-view.230" class="phpdocumentor-element-found-in__source" data-line="230" data-modal="source-view" data-src="files/redaxo-main/redaxo/src/core/lib/util/file.php.txt"></a>
+            <a href="classes/rex-file.html#source-view.236" class="phpdocumentor-element-found-in__source" data-line="236" data-modal="source-view" data-src="files/redaxo-main/redaxo/src/core/lib/util/file.php.txt"></a>
     </aside>
 
         <p class="phpdocumentor-summary">Deletes a file.</p>
@@ -550,9 +550,9 @@ <h4 class="phpdocumentor-element__name" id="method_extension">
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="redaxo-main/redaxo/src/core/lib/util/file.php"><a href="files/redaxo-main-redaxo-src-core-lib-util-file.html"><abbr title="redaxo-main/redaxo/src/core/lib/util/file.php">file.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">256</span>
+    <span class="phpdocumentor-element-found-in__line">262</span>
 
-            <a href="classes/rex-file.html#source-view.256" class="phpdocumentor-element-found-in__source" data-line="256" data-modal="source-view" data-src="files/redaxo-main/redaxo/src/core/lib/util/file.php.txt"></a>
+            <a href="classes/rex-file.html#source-view.262" class="phpdocumentor-element-found-in__source" data-line="262" data-modal="source-view" data-src="files/redaxo-main/redaxo/src/core/lib/util/file.php.txt"></a>
     </aside>
 
         <p class="phpdocumentor-summary">Extracts the extension of the given filename.</p>
@@ -619,9 +619,9 @@ <h4 class="phpdocumentor-element__name" id="method_formattedSize">
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="redaxo-main/redaxo/src/core/lib/util/file.php"><a href="files/redaxo-main-redaxo-src-core-lib-util-file.html"><abbr title="redaxo-main/redaxo/src/core/lib/util/file.php">file.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">301</span>
+    <span class="phpdocumentor-element-found-in__line">307</span>
 
-            <a href="classes/rex-file.html#source-view.301" class="phpdocumentor-element-found-in__source" data-line="301" data-modal="source-view" data-src="files/redaxo-main/redaxo/src/core/lib/util/file.php.txt"></a>
+            <a href="classes/rex-file.html#source-view.307" class="phpdocumentor-element-found-in__source" data-line="307" data-modal="source-view" data-src="files/redaxo-main/redaxo/src/core/lib/util/file.php.txt"></a>
     </aside>
 
         <p class="phpdocumentor-summary">Formates the filesize of the given file into a userfriendly form.</p>
@@ -913,9 +913,9 @@ <h4 class="phpdocumentor-element__name" id="method_getOutput">
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="redaxo-main/redaxo/src/core/lib/util/file.php"><a href="files/redaxo-main-redaxo-src-core-lib-util-file.html"><abbr title="redaxo-main/redaxo/src/core/lib/util/file.php">file.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">313</span>
+    <span class="phpdocumentor-element-found-in__line">319</span>
 
-            <a href="classes/rex-file.html#source-view.313" class="phpdocumentor-element-found-in__source" data-line="313" data-modal="source-view" data-src="files/redaxo-main/redaxo/src/core/lib/util/file.php.txt"></a>
+            <a href="classes/rex-file.html#source-view.319" class="phpdocumentor-element-found-in__source" data-line="319" data-modal="source-view" data-src="files/redaxo-main/redaxo/src/core/lib/util/file.php.txt"></a>
     </aside>
 
         <p class="phpdocumentor-summary">Gets executed content of given file.</p>
@@ -966,9 +966,9 @@ <h4 class="phpdocumentor-element__name" id="method_mimeType">
     <aside class="phpdocumentor-element-found-in">
     <abbr class="phpdocumentor-element-found-in__file" title="redaxo-main/redaxo/src/core/lib/util/file.php"><a href="files/redaxo-main-redaxo-src-core-lib-util-file.html"><abbr title="redaxo-main/redaxo/src/core/lib/util/file.php">file.php</abbr></a></abbr>
     :
-    <span class="phpdocumentor-element-found-in__line">268</span>
+    <span class="phpdocumentor-element-found-in__line">274</span>
 
-            <a href="classes/rex-file.html#source-view.268" class="phpdocumentor-element-found-in__source" data-line="268" data-modal="source-view" data-src="files/redaxo-main/redaxo/src/core/lib/util/file.php.txt"></a>
+            <a href="classes/rex-file.html#source-view.274" class="phpdocumentor-element-found-in__source" data-line="274" data-modal="source-view" data-src="files/redaxo-main/redaxo/src/core/lib/util/file.php.txt"></a>
     </aside>
 
         <p class="phpdocumentor-summary">Detects the mime type of the given file.</p>

diff --git a/files/redaxo-main/redaxo/src/core/lib/util/file.php.txt b/files/redaxo-main/redaxo/src/core/lib/util/file.php.txt
@@ -94,7 +94,7 @@ class rex_file
 
             // mimic a atomic write
             $tmpFile = @tempnam(dirname($file), rex_path::basename($file));
-            if (false !== file_put_contents($tmpFile, $content) && rename($tmpFile, $file)) {
+            if (false !== file_put_contents($tmpFile, $content) && self::move($tmpFile, $file)) {
                 @chmod($file, rex::getFilePerm());
                 return true;
             }
@@ -217,7 +217,13 @@ class rex_file
      */
     public static function move(string $srcfile, string $dstfile): bool
     {
-        return rename($srcfile, $dstfile);
+        if (@rename($srcfile, $dstfile)) {
+            return true;
+        }
+        if (copy($srcfile, $dstfile)) {
+            return unlink($srcfile);
+        }
+        return false;
     }
 
     /**