Changeset 38235

Timestamp:

08/09/2016 09:53:12 PM (8 years ago)

Author:

ocean90

Message:

Media: In _wp_handle_upload() use call_user_func_array() to call the upload error handler.

The default error handler wp_handle_upload_error() expects a reference for the first parameter but call_user_func() doesn't pass parameters by reference. The current code didn't produce any issues until now. PHP 7.0.9 (and PHP 7.1) is now stricter and prevents calling the error handler with a warning:

PHP Warning: Parameter 1 to wp_handle_upload_error() expected to be a reference, value given.

To restore the error handler _wp_handle_upload() now uses call_user_func_array().

Props jbrinley.
Props jorbin for review.
Fixes #37570.

File:

• trunk/src/wp-admin/includes/file.php (modified) (6 diffs)

trunk/src/wp-admin/includes/file.php

@@ -271 +271 @@
     // 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  );
     }
 
@@ -313 +313 @@
     // A correct form post will pass this test.
     if ( $test_form && ( ! isset( $_POST['action'] ) || ( $_POST['action'] != $action ) ) ) {
-        return call_user_func( $upload_error_handler, $file, __( 'Invalid form submission.' ) );
+        return call_user_func ) );
     }
     // A successful upload will pass this test. It makes no sense to override this one.
     if ( isset( $file['error'] ) && $file['error'] > 0 ) {
-        return call_user_func( $upload_error_handler, $file, $upload_error_strings[ $file['error'] ] );
+        return call_user_func );
     }
 
@@ -328 +328 @@
             $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 );
+        return call_user_func );
     }
 
@@ -334 +334 @@
     $test_uploaded_file = 'wp_handle_upload' === $action ? @ is_uploaded_file( $file['tmp_name'] ) : @ is_file( $file['tmp_name'] );
     if ( ! $test_uploaded_file ) {
-        return call_user_func( $upload_error_handler, $file, __( 'Specified file failed upload test.' ) );
+        return call_user_func ) );
     }
 
@@ -349 +349 @@
         }
         if ( ( ! $type || !$ext ) && ! current_user_can( 'unfiltered_upload' ) ) {
-            return call_user_func( $upload_error_handler, $file, __( 'Sorry, this file type is not permitted for security reasons.' ) );
+            return call_user_func ) );
         }
         if ( ! $type ) {
@@ -363 +363 @@
      */
     if ( ! ( ( $uploads = wp_upload_dir( $time ) ) && false === $uploads['error'] ) ) {
-        return call_user_func( $upload_error_handler, $file, $uploads['error'] );
+        return call_user_func );
     }