Ticket #21848: 21848.diff

src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js

@@ -437 +437 @@
                                 width = c.match( /width="([0-9]*)"/ );
                                 width = ( width && width[1] ) ? width[1] : '';
 
+                                classes = b.match( /class="([^"]*)"/ );
+                                classes = ( classes && classes[1] ) ? classes[1] : '';
+                                align = classes.match( /align[a-z]+/i ) || 'alignnone';
+
                                 if ( ! width || ! caption ) {
+                                        if ( 'alignnone' !== align[0] ) {
+                                                c = c.replace( /><img/, ' class="' + align[0] + '"><img' );
+                                        }
                                         return c;
                                 }
 
@@ -444 +451 @@
                                 id = b.match( /id="([^"]*)"/ );
                                 id = ( id && id[1] ) ? id[1] : '';
 
-                                classes = b.match( /class="([^"]*)"/ );
-                                classes = ( classes && classes[1] ) ? classes[1] : '';
-
-                                align = classes.match( /align[a-z]+/i ) || 'alignnone';
                                 classes = classes.replace( /wp-caption ?|align[a-z]+ ?/gi, '' );
 
                                 if ( classes ) {