Ticket #24868: 24868.diff

wp-includes/js/media-editor.js

@@ -236 +236 @@
                                 args.perPage = -1;
 
                                 // Mark the `orderby` override attribute.
+                                if( undefined !== attrs.orderby )
+                                        attrs.orderByField = attrs.orderby;
+                                
                                 if ( 'rand' === attrs.orderby )
                                         attrs._orderbyRandom = true;
 
@@ -281 +284 @@
                                 // Copy the `uploadedTo` post ID.
                                 if ( props.uploadedTo )
                                         attrs.id = props.uploadedTo;
-
+                                
                                 // Check if the gallery is randomly ordered.
+                                delete attrs.orderby;
+                                
                                 if ( attrs._orderbyRandom )
                                         attrs.orderby = 'rand';
+                                else if ( attrs.orderByField && attrs.orderByField != 'rand' )
+                                        attrs.orderby = attrs.orderByField;
+                                
                                 delete attrs._orderbyRandom;
+                                delete attrs.orderByField;
 
                                 // If the `ids` attribute is set and `orderby` attribute
                                 // is the default value, clear it for cleaner output.