WordPress.org

Make WordPress Core

Ticket #11649: 11649.diff

File 11649.diff, 1020 bytes (added by ryan, 8 years ago)
  • wp-admin/includes/upgrade.php

     
    16881688        // Upgrade versions prior to 2.9
    16891689        if ( $wp_current_db_version < 11557 ) {
    16901690                // Delete duplicate options.  Keep the option with the highest option_id.
    1691                 $delete_options = $wpdb->get_col("SELECT o1.option_id FROM $wpdb->options AS o1 JOIN $wpdb->options AS o2 ON o2.option_name = o1.option_name AND o2.option_id > o1.option_id");
    1692                 if ( !empty($delete_options) ) {
    1693                         $delete_options = implode(',', $delete_options);
    1694                         $wpdb->query("DELETE FROM $wpdb->options WHERE option_id IN ($delete_options)");
    1695                 }
     1691                $wpdb->query("DELETE o1 FROM $wpdb->options AS o1 JOIN $wpdb->options AS o2 USING (`option_name`) WHERE o2.option_id > o1.option_id");
    16961692
    16971693                // Drop the old primary key and add the new.
    16981694                $wpdb->query("ALTER TABLE $wpdb->options DROP PRIMARY KEY, ADD PRIMARY KEY(option_id)");