Changeset 25720

Timestamp:

10/07/2013 07:01:48 PM (11 years ago)

Author:

nacin

Message:

Prevent the removal of a manual 'orderby' attribute in the gallery shortcode.

props nofearinc.
fixes #24868.

File:

• trunk/src/wp-includes/js/media-editor.js (modified) (2 diffs)

trunk/src/wp-includes/js/media-editor.js

@@ -237 +237 @@
 
                 // Mark the `orderby` override attribute.
+                if( undefined !== attrs.orderby )
+                    attrs._orderByField = attrs.orderby;
+
                 if ( 'rand' === attrs.orderby )
                     attrs._orderbyRandom = true;
@@ -284 +287 @@
 
                 // 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