Changeset 36539

Timestamp:

02/16/2016 10:11:14 PM (11 years ago)

Author:

ocean90

Message:

Themes: Use the attachment ID as the key in get_uploaded_header_images().

Prevents missing header images when an image has the same name as another header image.

Props sirbrillig.
Fixes #31786.

Location:

trunk/src

Files:

• wp-admin/custom-header.php (modified) (1 diff)
• wp-includes/theme.php (modified) (1 diff)

trunk/src/wp-admin/custom-header.php

@@ -978 +978 @@
          *      for randomly cycling among the default images; 'random-uploaded-image', for randomly cycling
          *      among the uploaded images; the key of a default image registered for that theme; and
-         *      the key of an image uploaded for that theme (the basename of the URL).
+         *      the key of an image uploaded for that theme (the attachment ID of the image).
          *  Or an array of arguments: attachment_id, url, width, height. All are required.
          */

trunk/src/wp-includes/theme.php

@@ -1208 +1208 @@
                 $url = esc_url_raw( wp_get_attachment_url( $header->ID ) );
                 $header_data = wp_get_attachment_metadata( $header->ID );
-                $header_index = basename($url);
+                $header_index = $header->ID;
 
                 $header_images[$header_index] = array();