Changeset 34163

Timestamp:

09/15/2015 02:49:12 AM (10 years ago)

Author:

wonderboymusic

Message:

Don't ever use the guid value when retrieving URLs for media, use wp_get_attachment_url(). Use get_attached_file() for path to file.

Fixes #33386.

Location:

trunk/src

Files:

• wp-admin/async-upload.php (modified) (1 diff)
• wp-admin/custom-header.php (modified) (1 diff)
• wp-admin/includes/ajax-actions.php (modified) (1 diff)
• wp-admin/includes/class-wp-media-list-table.php (modified) (1 diff)
• wp-admin/includes/class-wp-site-icon.php (modified) (1 diff)
• wp-admin/includes/media.php (modified) (1 diff)
• wp-includes/media.php (modified) (2 diffs)
• wp-includes/post-functions.php (modified) (2 diffs)

trunk/src/wp-admin/async-upload.php

@@ -63 +63 @@
                 echo '<img class="pinkynail" src="' . esc_url( $thumb_url[0] ) . '" alt="" />';
             echo '<a class="edit-attachment" href="' . esc_url( get_edit_post_link( $id ) ) . '" target="_blank">' . _x( 'Edit', 'media item' ) . '</a>';
-            $title = $post->post_title ? $post->post_title : wp_basename( $post->guid ); // Title shouldn't ever be empty, but use filename just in case.
+
+            // Title shouldn't ever be empty, but use filename just in case.
+            $file = get_attached_file( $post->ID );
+            $title = $post->post_title ? $post->post_title : wp_basename( $file );
             echo '<div class="filename new"><span class="title">' . esc_html( wp_html_excerpt( $title, 60, '&hellip;' ) ) . '</span></div>';
             break;

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

@@ -1117 +1117 @@
     final public function create_attachment_object( $cropped, $parent_attachment_id ) {
         $parent = get_post( $parent_attachment_id );
-        $parent_url = $parent->guid;
+        $parent_url = wp_get_attachment_url( $parent->ID );
         $url = str_replace( basename( $parent_url ), basename( $cropped ), $parent_url );
 

trunk/src/wp-admin/includes/ajax-actions.php

@@ -3156 +3156 @@
             $cropped = apply_filters( 'wp_create_file_in_uploads', $cropped, $attachment_id ); // For replication.
 
-            $parent_url = get_post( $attachment_id )->guid;
+            $parent_url = wp_get_attachment_url( $attachment_id );
             $url        = str_replace( basename( $parent_url ), basename( $cropped ), $parent_url );
 

trunk/src/wp-admin/includes/class-wp-media-list-table.php

@@ -371 +371 @@
             <?php _media_states( $post ); ?>
         </strong>
-        <p class="filename"><span class="screen-reader-text"><?php _e( 'File name:' ); ?> </span><?php echo wp_basename( $post->guid ); ?></p>
+        <p class="filename">
+            <span class="screen-reader-text"><?php _e( 'File name:' ); ?> </span>
+            <?php 
+            $file = get_attached_file( $post->ID );
+            echo wp_basename( $file );
+            ?>
+        </p>
         <?php
     }

trunk/src/wp-admin/includes/class-wp-site-icon.php

@@ -81 +81 @@
     public function create_attachment_object( $cropped, $parent_attachment_id ) {
         $parent     = get_post( $parent_attachment_id );
-        $parent_url = $parent->guid;
+        $parent_url = wp_get_attachment_url( $parent->ID );
         $url        = str_replace( basename( $parent_url ), basename( $cropped ), $parent_url );
 

trunk/src/wp-admin/includes/media.php

@@ -1369 +1369 @@
     $toggle_off = __( 'Hide' );
 
-    $filename = esc_html( wp_basename( $post->guid ) );
+    $file = get_attached_file( $post->ID );
+    $filename = esc_html( wp_basename( $file ) );
     $title = esc_attr( $post->post_title );
 

trunk/src/wp-includes/media.php

@@ -1176 +1176 @@
     <# } #>
     <div class="wp-playlist-caption">
-        <span class="wp-playlist-item-meta wp-playlist-item-title"><?php 
+        <span class="wp-playlist-item-meta wp-playlist-item-title"><?php
             /* translators: playlist item title */
             printf( _x( '&#8220;%s&#8221;', 'playlist item title' ), '{{ data.title }}' );
@@ -2077 +2077 @@
         return array();
 
-    $filename = basename($attachment->guid);
+    $file = get_attached_file( $attachment->ID );
+    $filename = basename( $file );
 
     $objects = array('attachment');

trunk/src/wp-includes/post-functions.php

@@ -4649 +4649 @@
         wp_delete_comment( $comment_id, true );
     }
-    
+
     wp_defer_comment_counting( false );
 
@@ -4975 +4975 @@
             if ( $post = get_post( $mime ) ) {
                 $post_id = (int) $post->ID;
-                $ext = preg_replace('/^.+?\.([^.]+)$/', '$1', $post->guid);
+                $file = get_attached_file( $post_id );
+                $ext = preg_replace('/^.+?\.([^.]+)$/', '$1', $file);
                 if ( !empty($ext) ) {
                     $post_mimes[] = $ext;