Ticket #37570: 37570.3.diff

src/wp-admin/includes/file.php

@@ -245 +245 @@
 function _wp_handle_upload( &$file, $overrides, $time, $action ) {
         // The default error handler.
         if ( ! function_exists( 'wp_handle_upload_error' ) ) {
-                function wp_handle_upload_error( &$file, $message ) {
+                function wp_handle_upload_error( $file, $message ) {
                         return array( 'error' => $message );
                 }
         }
@@ -270 +270 @@
 
         // You may have had one or more 'wp_handle_upload_prefilter' functions error out the file. Handle that gracefully.
         if ( isset( $file['error'] ) && ! is_numeric( $file['error'] ) && $file['error'] ) {
-                return $upload_error_handler( $file, $file['error'] );
+                return call_user_func( $upload_error_handler, $file, $file['error'] );
         }
 
         // Install user overrides. Did we mention that this voids your warranty?