Ticket #47147: 47147.1.diff

src/js/_enqueues/lib/image-edit.js

@@ -503 +503 @@
 
                         // If a response is returned, close the editor and show an error.
                         if ( ret.error ) {
-                                $('#imgedit-response-' + postid).html('<div class="error"><p>' + ret.error + '</p></div>');
+                                $('#imgedit-response-' + postid).html('<div class="error"><p>' + ret.error + '</p></div>');
                                 imageEdit.close(postid);
                                 return;
                         }
@@ -517 +517 @@
                         }
 
                         if ( ret.msg ) {
-                                $('#imgedit-response-' + postid).html('<div class="updated"><p>' + ret.msg + '</p></div>');
+                                $('#imgedit-response-' + postid).html('<div class="updated"><p>' + ret.msg + '</p></div>');
                         }
 
                         if ( self._view ) {

src/wp-admin/includes/image-edit.php

@@ -38 +38 @@
 
         if ( $msg ) {
                 if ( isset( $msg->error ) ) {
-                        $note = "<div class='error'><p>$msg->error</p></div>";
+                        $note = "<div class='error'><p>$msg->error</p></div>";
                 } elseif ( isset( $msg->msg ) ) {
-                        $note = "<div class='updated'><p>$msg->msg</p></div>";
+                        $note = "<div class='updated'><p>$msg->msg</p></div>";
                 }
         }
 
@@ -234 +234 @@
                 <input type="hidden" id="imgedit-y-<?php echo $post_id; ?>" value="<?php echo isset( $meta['height'] ) ? $meta['height'] : 0; ?>" />
 
                 <div id="imgedit-crop-<?php echo $post_id; ?>" class="imgedit-crop-wrap">
-                <img id="image-preview-<?php echo $post_id; ?>" onload="imageEdit.imgLoaded('<?php echo $post_id; ?>')" src="<?php echo admin_url( 'admin-ajax.php', 'relative' ); ?>?action=imgedit-preview&amp;_ajax_nonce=<?php echo $nonce; ?>&amp;postid=<?php echo $post_id; ?>&amp;rand=<?php echo rand( 1, 99999 ); ?>" alt="" />
+                <img id="image-preview-<?php echo $post_id; ?>"  src="<?php echo admin_url( 'admin-ajax.php', 'relative' ); ?>?action=imgedit-preview&amp;_ajax_nonce=<?php echo $nonce; ?>&amp;postid=<?php echo $post_id; ?>&amp;rand=<?php echo rand( 1, 99999 ); ?>" alt="" />
                 </div>
 
                 <div class="imgedit-submit">