Changeset 6045 for sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload.php

Timestamp:

10/19/2017 12:06:14 AM (7 years ago)

Author:

SergeyBiryukov

Message:

Plugin Directory: Remove the upload form after a successful upload.

Make Upload_Handler::process_upload() return WP_Error on failure.

Fixes #2386.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload.php (modified) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload.php

@@ -46 +46 @@
             }
 
+            $upload_result = false;
+
             if ( ! empty( $_POST['_wpnonce'] ) && wp_verify_nonce( $_POST['_wpnonce'], 'wporg-plugins-upload' ) && 'upload' === $_POST['action'] ) :
                 if ( UPLOAD_ERR_OK === $_FILES['zip_file']['error'] ) :
-                    $uploader = new Upload_Handler;
-                    $message  = $uploader->process_upload();
+                    $uploader      = new Upload_Handler;
+                    $upload_result = $uploader->process_upload();
+
+                    if ( is_wp_error( $upload_result ) ) {
+                        $message = $upload_result->get_error_message();
+                    } else {
+                        $message = $upload_result;
+                    }
                 else :
                     $message = __( 'Error in file upload.', 'wporg-plugins' );
@@ -119 +127 @@
             <?php endif; // wp_verify_nonce() && 'upload' === $_POST['action'] ?>
 
-            <?php if ( ! $submitted_counts->total ) : ?>
+            <?php if ( ! $upload_result && ! $submitted_counts->total || is_wp_error( $upload_result ) ) : ?>
 
                 <form id="upload_form" class="plugin-upload-form" enctype="multipart/form-data" method="POST" action="">