Index: link-template.php
===================================================================
--- link-template.php	(revision 29499)
+++ link-template.php	(working copy)
@@ -257,12 +257,12 @@
 
 	$post_type = get_post_type_object($post->post_type);
 
+	if ( $post_type->hierarchical )
+		$slug = get_page_uri($id);
+
 	if ( !empty($post_link) && ( !$draft_or_pending || $sample ) ) {
-		if ( ! $leavename ) {
-			if ( $post_type->hierarchical )
-				$slug = get_page_uri($id);
+		if ( ! $leavename )
 			$post_link = str_replace("%$post->post_type%", $slug, $post_link);
-		}
 		$post_link = home_url( user_trailingslashit($post_link) );
 	} else {
 		if ( $post_type->query_var && ( isset($post->post_status) && !$draft_or_pending ) )
