Revert "Fix #635 use mv instead of rename as that does not support cr…

…oss volume operations" This reverts commit d61d260.
getgrav · Dec 14, 2016 · 5b6452d · 5b6452d
1 parent d61d260
commit 5b6452d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,7 +3,6 @@
 
 1. [](#bugfix)
     * Fixed case where extracting a package would cause an error during rename
-    * Fixed [#635](https://github.com/getgrav/grav/issues/635) use mv instead of rename as that does not support cross volume operations
 
 # v1.1.9
 ## 12/13/2016

diff --git a/system/src/Grav/Common/Filesystem/Folder.php b/system/src/Grav/Common/Filesystem/Folder.php
@@ -340,13 +340,11 @@ public static function move($source, $target)
         // Make sure that path to the target exists before moving.
         self::create(dirname($target));
 
-        error_clear_last();
-
         // Just rename the directory.
-        exec("mv $source $target");
+        $success = @rename($source, $target);
 
-        $error = error_get_last();
-        if ($error) {
+        if (!$success) {
+            $error = error_get_last();
             throw new \RuntimeException($error['message']);
         }