Ticket #4839: 4839.diff

wordpress.org/public_html/wp-content/plugins/theme-directory/upload.php

@@ -13 +13 @@
  */
 function wporg_themes_render_upload_shortcode() {
         if ( ! defined( 'THEME_TRACBOT_PASSWORD' ) || ! defined( 'THEME_DROPBOX_PASSWORD' ) ) {
-                printf( '<!-- %s -->', 'Please define SVN and Trac passwords.' );
-                return;
+                return '<!-- Please define SVN and Trac passwords. -->';
         }
 
-        if ( is_user_logged_in() ) :
-
-                if ( ! empty( $_POST['_wpnonce'] ) && wp_verify_nonce( $_POST['_wpnonce'], 'wporg-themes-upload' ) && 'upload' === $_POST['action'] ) {
-                        $message = wporg_themes_process_upload(); 
-
-                        if ( ! empty( $message ) ) {
-                                echo "<div class='notice notice-warning'><p>{$message}</p></div>\n";
-                        }
-                }
-        ?>
-                <h4><?php _e( 'Select your zipped theme file', 'wporg-themes' ); ?></h4>
-                <form enctype="multipart/form-data" id="upload_form" method="POST" action="" onsubmit="jQuery('#upload_button').attr('disabled','disabled'); return true;">
-                        <?php wp_nonce_field( 'wporg-themes-upload' ); ?>
-                        <input type="hidden" name="action" value="upload"/>
-                        <input type="file" id="zip_file" name="zip_file" size="25"/>
-                        <input id="upload_button" class="button" type="submit" value="<?php esc_attr_e( 'Upload', 'wporg-themes' ); ?>"/>
+        if ( ! is_user_logged_in() ) {
 
-                        <p>
-                                <small><?php printf( __( 'Maximum allowed file size: %s', 'wporg-themes' ), esc_html( wporg_themes_get_max_allowed_file_size() ) ); ?></small>
-                        </p>
-                </form>
-        <?php else : ?>
-                <p><?php printf(
+                $log_in_text = sprintf(
                         __( 'Before you can upload a new theme, <a href="%s">please log in</a>.', 'wporg-themes' ),
                         add_query_arg(
                                 'redirect_to',
                                 urlencode( 'https://wordpress.org/themes/upload/' ),
                                 'https://login.wordpress.org/'
                         )
-                ); ?><p>
-        <?php endif;
+                );
+
+                return '<p>' . $log_in_text . '</p>';
+        }
+
+        $notice = '';
+
+        if ( ! empty( $_POST['_wpnonce'] ) && wp_verify_nonce( $_POST['_wpnonce'], 'wporg-themes-upload' ) && 'upload' === $_POST['action'] ) {
+                $message = wporg_themes_process_upload();
+
+                if ( ! empty( $message ) ) {
+                        $notice = "<div class='notice notice-warning'><p>{$message}</p></div>";
+                }
+        }
+
+        $form = '<h4>' . __( 'Select your zipped theme file', 'wporg-themes' ) . '</h4>
+                <form enctype="multipart/form-data" id="upload_form" method="POST" action="" onsubmit="jQuery(\'#upload_button\').attr(\'disabled\',\'disabled\'); return true;">
+                        ' . wp_nonce_field( 'wporg-themes-upload', '_wpnonce', true, false ) . '
+                        <input type="hidden" name="action" value="upload"/>
+                        <input type="file" id="zip_file" name="zip_file" size="25"/>
+                        <button id="upload_button" class="button" type="submit" value="' . esc_attr__( 'Upload', 'wporg-themes' ) . '">' . esc_html__( 'Upload', 'wporg-themes' ) . '</button>
+                        <p>
+                                <small>' . sprintf( __( 'Maximum allowed file size: %s', 'wporg-themes' ), esc_html( wporg_themes_get_max_allowed_file_size() ) ) . '</small>
+                        </p>
+                </form>';
+
+        return $notice . $form;
 }
 
 /**

wordpress.org/public_html/wp-content/themes/pub/wporg-themes/page-upload.php

@@ -37 +37 @@
 
                         <div class="entry-content">
                                 <p><?php esc_html_e( 'Your theme will be submitted for review to be distributed on the official WordPress.org Theme Directory.', 'wporg-themes' ); ?></p>
-                                <?php the_content(); // do_shortcode( '[wporg-themes-upload]' ); ?>
+                                <h3><?php esc_html_e( 'Read the requirements before updating a theme', 'wporg-themes' ); ?></h3>
+                                <p><?php printf( __( 'In order to have your theme hosted on <a href="%1$s" target="_blank" rel="noopener noreferrer">WordPress.org</a>, your code is required to comply with all the <a href="%2$s" target="_blank" rel="noopener noreferrer">requirements on the Theme Review Teams handbook page</a>.'), esc_url( 'https://wordpress.org/' ), esc_url( 'https://make.wordpress.org/themes/handbook/review/required/' ) ) ?></p>
+                                <div style="height: 20px;" aria-hidden="true" class="wp-block-spacer"></div>
+                                <?php the_content(); ?>
+                                <div style="height: 20px;" aria-hidden="true" class="wp-block-spacer"></div>
+                                <h3><?php esc_html_e( 'How to upload a theme update', 'wporg-themes' ); ?></h3>
+                                <p><?php esc_html_e( 'If you are uploading a theme update, simply increase the version inside of style.css and upload the themename.zip file again, just like you do with a new theme.', 'wporg-themes' ); ?></p>
                         </div><!-- .entry-content -->
 
                 </article><!-- #post-## -->