Changeset 13290

Timestamp:

02/22/2010 04:54:51 PM (15 years ago)

Author:

ryan

Message:

Pass overrides. Allow ref array calling. Props tychay. fixes #12278

Location:

trunk/wp-admin/includes

Files:

• file.php (modified) (6 diffs)
• media.php (modified) (2 diffs)

trunk/wp-admin/includes/file.php

@@ -228 +228 @@
 function wp_handle_upload( &$file, $overrides = false, $time = null ) {
     // The default error handler.
-    if (! function_exists( 'wp_handle_upload_error' ) ) {
+    if ( ! function_exists( 'wp_handle_upload_error' ) ) {
         function wp_handle_upload_error( &$file, $message ) {
             return array( 'error'=>$message );
@@ -263 +263 @@
     $test_form = true;
     $test_size = true;
+    $test_upload = true;
 
     // If you override this, you must provide $ext and $type!!!!
@@ -274 +275 @@
     // A correct form post will pass this test.
     if ( $test_form && (!isset( $_POST['action'] ) || ($_POST['action'] != $action ) ) )
-        return $upload_error_handler( $file, __( 'Invalid form submission.' ));
+        return call_user_func($upload_error_handler, $file, __( 'Invalid form submission.' ));
 
     // A successful upload will pass this test. It makes no sense to override this one.
     if ( $file['error'] > 0 )
-        return $upload_error_handler( $file, $upload_error_strings[$file['error']] );
+        return call_user_func($upload_error_handler, $file, $upload_error_strings[$file['error']] );
 
     // A non-empty file will pass this test.
-    if ( $test_size && !($file['size'] > 0 ) )
-        return $upload_error_handler( $file, __( 'File is empty. Please upload something more substantial. This error could also be caused by uploads being disabled in your php.ini or by post_max_size being defined as smaller than upload_max_filesize in php.ini.' ));
+    if ( $test_size && !($file['size'] > 0 ) ) {
+        if ( is_multisite() )
+            $error_msg = __( 'File is empty. Please upload something more substantial.' );
+        else
+            $error_msg = __( 'File is empty. Please upload something more substantial. This error could also be caused by uploads being disabled in your php.ini or by post_max_size being defined as smaller than upload_max_filesize in php.ini.' );
+        return call_user_func($upload_error_handler, $file, $error_msg);
+    }
 
     // A properly uploaded file will pass this test. There should be no reason to override this one.
-    if (! @ is_uploaded_file( $file['tmp_name'] ) )
-        return $upload_error_handler( $file, __( 'Specified file failed upload test.' ));
+    if ( $test_upload && ! @ is_uploaded_file( $file['tmp_name'] ) )
+        return call_user_func($upload_error_handler, $file, __( 'Specified file failed upload test.' ));
 
     // A correct MIME type will pass this test. Override $mimes or use the upload_mimes filter.
@@ -295 +301 @@
 
         if ( ( !$type || !$ext ) && !current_user_can( 'unfiltered_upload' ) )
-            return $upload_error_handler( $file, __( 'File type does not meet security guidelines. Try another.' ));
+            return call_user_func($upload_error_handler, $file, __( 'File type does not meet security guidelines. Try another.' ));
 
         if ( !$ext )
@@ -308 +314 @@
     // A writable uploads dir will pass this test. Again, there's no point overriding this one.
     if ( ! ( ( $uploads = wp_upload_dir($time) ) && false === $uploads['error'] ) )
-        return $upload_error_handler( $file, $uploads['error'] );
+        return call_user_func($upload_error_handler, $file, $uploads['error'] ); 
 
     $filename = wp_unique_filename( $uploads['path'], $file['name'], $unique_filename_callback );
@@ -314 +320 @@
     // Move the file to the uploads dir
     $new_file = $uploads['path'] . "/$filename";
-    if ( false === @ move_uploaded_file( $file['tmp_name'], $new_file ) ) {
+    if ( false === @ move_uploaded_file( $file['tmp_name'], $new_file ) )
         return $upload_error_handler( $file, sprintf( __('The uploaded file could not be moved to %s.' ), $uploads['path'] ) );
-    }
 
     // Set correct file permissions

trunk/wp-admin/includes/media.php

@@ -178 +178 @@
  * @since unknown
  *
- * @param unknown_type $file_id
- * @param unknown_type $post_id
- * @param unknown_type $post_data
- * @return unknown
- */
-function media_handle_upload($file_id, $post_id, $post_data = array()) {
-    $overrides = array('test_form'=>false);
+ * @param string $file_id Index into the {@link $_FILES} array of the upload
+ * @param int $post_id The post ID the media is associated with
+ * @param array $post_data allows you to overwrite some of the attachment
+ * @param array $overrides allows you to override the {@link wp_handle_upload()} behavior
+ * @return int the ID of the attachment
+ */
+function media_handle_upload($file_id, $post_id, $post_data = array(), $overrides = array( 'test_form' => false )) {
 
     $time = current_time('mysql');
@@ -462 +462 @@
         $html = $attachment['post_title'];
         if ( !empty($attachment['url']) ) {
+            $rel = '';
             if ( strpos($attachment['url'], 'attachment_id') || false !== strpos($attachment['url'], get_permalink($_POST['post_id'])) )
                 $rel = " rel='attachment wp-att-" . esc_attr($send_id)."'";