Changeset 4961 for trunk/wp-includes/functions.php

Timestamp:

03/03/2007 04:56:46 PM (20 years ago)

Author:

ryan

Message:

xmlrpc updates from Joseph Scott.

File:

• trunk/wp-includes/functions.php (modified) (3 diffs)

trunk/wp-includes/functions.php

@@ -1116 +1116 @@
         else
                 $ext = ".$ext";
-        while ( file_exists($upload['path'] . "/$filename") && !$overwrite ) {
+        while ( file_exists($upload['path'] . "/$filename") ) {
                 if ( '' == "$number$ext" )
                         $filename = $filename . ++$number . $ext;
@@ -1123 +1123 @@
         }
 
-        $new_file = $upload['path'] . "/$filename";
-        if ( ! wp_mkdir_p( dirname($new_file) ) ) {
-                $message = sprintf(__('Unable to create directory %s. Is its parent directory writable by the server?'), dirname($new_file));
-                return array('error' => $message);
+        // If we are asked to over write the file then make sure
+        // the $name has the complete path and is writable.
+        if($overwrite) {
+                if(!is_writable($name)) {
+                        return(array("error" => __("Can not over write file.")));
+                }
+                $new_file = $name;
+                $filename = basename($name);
+        }
+        else {
+                $new_file = $upload['path'] . "/$filename";
+                if ( ! wp_mkdir_p( dirname($new_file) ) ) {
+                        $message = sprintf(__('Unable to create directory %s. Is its parent directory writable by the server?'), dirname($new_file));
+                        return array('error' => $message);
+                }
         }
 
@@ -1141 +1152 @@
         @ chmod($new_file, $perms);
 
-        // Compute the URL
+        // Compute the URL if this is a new file.
         $url = $upload['url'] . "/$filename";
+        if($overwrite) {
+                $url = $name;
+        }
 
         return array('file' => $new_file, 'url' => $url, 'error' => false);