Changeset 13001

Timestamp:

02/07/2010 02:15:27 AM (17 years ago)

Author:

dd32

Message:

Use rename() if possible in WP_Filesystem_Direct::move(). Props reaperhulk. Fixes #12150

File:

• trunk/wp-admin/includes/class-wp-filesystem-direct.php (modified) (1 diff)

trunk/wp-admin/includes/class-wp-filesystem-direct.php

@@ -197 +197 @@
                 if ( ! $overwrite && $this->exists($destination) )
                         return false;
+
                 return copy($source, $destination);
         }
 
         function move($source, $destination, $overwrite = false) {
-                //Possible to use rename()?
+                if ( ! $overwrite && $this->exists($destination) )
+                        return false;
+
+                // try using rename first.  if that fails (for example, source is read only) try copy 
+                if ( @rename($source, $destination) )
+                        return true;
+
                 if ( $this->copy($source, $destination, $overwrite) && $this->exists($destination) ) {
                         $this->delete($source);