Ticket #33693: 33693.diff

wp-admin/edit.php

@@ -10 +10 @@
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
 if ( ! $typenow )
-        wp_die( __( 'Invalid post type' ) );
+        wp_die( __( 'This Invalid post type' ) );
 
 if ( 'attachment' === $typenow ) {
         if ( wp_redirect( admin_url( 'upload.php' ) ) ) {

wp-includes/link-template.php

@@ -622 +622 @@
         if ( empty( $feed ) )
                 $feed = get_default_feed();
 
-        if ( '' != get_option('permalink_structure') ) {
+        if ( 0 == wp_get_post_parent_id($post_id) && is_attachment() ) {
+                $url = add_query_arg( array( 'feed' => $feed, 'attachment_id' => $post_id ), home_url( '/' ) );
+        } else if ( '' != get_option('permalink_structure') ) {
                 if ( 'page' == get_option('show_on_front') && $post_id == get_option('page_on_front') )
                         $url = _get_page_link( $post_id );
                 else