Changeset 8796

Timestamp:

09/02/2008 10:55:39 PM (17 years ago)

Author:

ryan

Message:

Make attachment file path relative to the upload dir. Don't use GUID to find attachement URL. Props DD32. see #7622

Location:

trunk

Files:

• wp-admin/includes/image.php (modified) (1 diff)
• wp-includes/post.php (modified) (3 diffs)

trunk/wp-admin/includes/image.php

@@ -94 +94 @@
         list($uwidth, $uheight) = wp_shrink_dimensions($metadata['width'], $metadata['height']);
         $metadata['hwstring_small'] = "height='$uheight' width='$uwidth'";
+        // Make the file path relative to the upload dir
+        if ( ($uploads = wp_upload_dir()) && false === $uploads['error'] ) { // Get upload directory
+            if ( 0 === strpos($file, $uploads['basedir']) ) {// Check that the upload base exists in the file path
+                $file = str_replace($uploads['basedir'], '', $file); // Remove upload dir from the file path
+                $file = ltrim($file, '/');
+            }
+        }
         $metadata['file'] = $file;
 

trunk/wp-includes/post.php

@@ -28 +28 @@
 function get_attached_file( $attachment_id, $unfiltered = false ) {
     $file = get_post_meta( $attachment_id, '_wp_attached_file', true );
+    // If the file is relative, prepend upload dir
+    if ( 0 !== strpos($file, '/') ) {
+        $uploads = wp_upload_dir();
+        $file = $uploads['basedir'] . "/$file";
+    }
+        
     if ( $unfiltered )
         return $file;
@@ -51 +57 @@
 
     $file = apply_filters( 'update_attached_file', $file, $attachment_id );
+
+    // Make the file path relative to the upload dir
+    if ( ($uploads = wp_upload_dir()) && false === $uploads['error'] ) { // Get upload directory
+        if ( 0 === strpos($file, $uploads['basedir']) ) {// Check that the upload base exists in the file path
+                $file = str_replace($uploads['basedir'], '', $file); // Remove upload dir from the file path
+                $file = ltrim($file, '/');
+        }
+    }
 
     return update_post_meta( $attachment_id, '_wp_attached_file', $file );
@@ -2451 +2465 @@
         return false;
 
-    $url = get_the_guid( $post->ID );
-
-    if ( 'attachment' != $post->post_type || !$url )
+    $url = '';
+    if ( $file = get_post_meta( $post->ID, '_wp_attached_file', true) ) { //Get attached file
+        if ( ($uploads = wp_upload_dir()) && false === $uploads['error'] ) { //Get upload directory
+            if ( 0 === strpos($file, $uploads['basedir']) ) //Check that the upload base exists in the file location
+                $url = str_replace($uploads['basedir'], $uploads['baseurl'], $file); //replace file location with url location
+        }
+    }
+
+    if ( empty($url) ) //If any of the above options failed, Fallback on the GUID as used pre-2.7, not recomended to rely upon this.
+        $url = get_the_guid( $post->ID );
+
+    if ( 'attachment' != $post->post_type || empty($url) )
         return false;