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

Timestamp:

03/09/2007 08:14:52 PM (20 years ago)

Author:

ryan

Message:

Change xmlrpc upload logic. Props Joseph Scott.

File:

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

trunk/wp-includes/functions.php

@@ -1095 +1095 @@
 }
 
-function wp_upload_bits($name, $type, $bits, $overwrite = false) {
+function wp_upload_bits($name, $type, $bits) {
         if ( empty($name) )
                 return array('error' => __("Empty filename"));
@@ -1123 +1123 @@
         }
 
-        // 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);
-                }
+        $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);
         }
 
@@ -1152 +1141 @@
         @ chmod($new_file, $perms);
 
-        // Compute the URL if this is a new file.
+        // Compute the URL
         $url = $upload['url'] . "/$filename";
-        if($overwrite) {
-                $url = $name;
-        }
 
         return array('file' => $new_file, 'url' => $url, 'error' => false);