Changes from trunk/src/wp-includes/post.php at r35725 to branches/4.4/src/wp-includes/post.php at r36151

File:

• branches/4.4/src/wp-includes/post.php (modified) (2 diffs)

branches/4.4/src/wp-includes/post.php

@@ -4291 +4291 @@
     foreach ( $page->ancestors as $parent ) {
         $parent = get_post( $parent );
-        if ( 'publish' === $parent->post_status ) {
+        if ( $parent ) {
             $uri = $parent->post_name . '/' . $uri;
         }
@@ -4870 +4870 @@
                 $url = str_replace($uploads['basedir'], $uploads['baseurl'], $file);
             } elseif ( false !== strpos($file, 'wp-content/uploads') ) {
-                $url = $uploads['baseurl'] . substr( $file, strpos($file, 'wp-content/uploads') + 18 );
+                // Get the directory name relative to the basedir (back compat for pre-2.7 uploads)
+                $url = trailingslashit( $uploads['baseurl'] . '/' . _wp_get_attachment_relative_path( $file ) ) . basename( $file );
             } else {
                 // It's a newly-uploaded file, therefore $file is relative to the basedir.