Ticket #9539: 9539.2.diff

wp-includes/version.php

@@ -15 +15 @@
  *
  * @global int $wp_db_version
  */
-$wp_db_version = 10850;
+$wp_db_version = 11200;
 
 ?>

wp-admin/includes/upgrade.php

@@ -340 +340 @@
         if ( $wp_current_db_version < 8989 )
                 upgrade_270();
 
-        if ( $wp_current_db_version < 10360 )
+        if ( $wp_current_db_version < 11200 )
                 upgrade_280();
 
         maybe_disable_automattic_widgets();
@@ -980 +980 @@
 
         if ( $wp_current_db_version < 10360 )
                 populate_roles_280();
+        
+        if ( $wp_current_db_version < 11200 )
+                fix_attachment_slug_conflicts();
 }
 
 

wp-admin/includes/schema.php

@@ -576 +576 @@
         }
 }
 
-?>
+/**
+ * Fix duplicate slugs in hierarchical data
+ * See http://core.trac.wordpress.org/ticket/9539
+ *
+ * @since 2.8.0
+ **/
+
+function fix_attachment_slug_conflicts() {
+        global $wpdb;
+        
+        $attachments = $wpdb->get_results("
+                SELECT attachment.*
+                FROM $wpdb->posts as attachment
+                JOIN $wpdb->posts as page
+                ON attachment.post_name = page.post_name
+                WHERE attachment.post_type = 'attachment'
+                AND page.post_type = 'page'
+                AND attachment.post_parent = page.post_parent
+                AND attachment.post_name <> ''
+                ");
+        
+        while ( $attachment = array_pop($attachments) )
+                wp_update_post($attachment);
+} # fix_attachment_slug_conflicts()
+?>
+ No newline at end of file