Merge "Add id field to watchlist db table"

diff --combined includes/installer/MysqlUpdater.php
index 154f7c3,b09f3a6..9a39b77
--- 1/includes/installer/MysqlUpdater.php
--- 2/includes/installer/MysqlUpdater.php
+++ b/includes/installer/MysqlUpdater.php
@@@ -279,6 -279,7 +279,7 @@@ class MysqlUpdater extends DatabaseUpda
                        [ 'dropTable', 'msg_resource_links' ],
                        [ 'dropTable', 'msg_resource' ],
                        [ 'addTable', 'bot_passwords', 'patch-bot_passwords.sql' ],
+                       [ 'addField', 'watchlist', 'wl_id', 'patch-watchlist-wl_id.sql' ],
                ];
        }
  
@@@ -516,7 -517,7 +517,7 @@@
                                $prev_title = $row->cur_title;
                                $prev_namespace = $row->cur_namespace;
                        }
 -                      $sql = "DELETE FROM $cur WHERE cur_id IN ( " . join( ',', $deleteId ) . ')';
 +                      $sql = "DELETE FROM $cur WHERE cur_id IN ( " . implode( ',', $deleteId ) . ')';
                        $this->db->query( $sql, __METHOD__ );
                        $this->output( wfTimestamp( TS_DB ) );
                        $this->output( "......<b>Deleted</b> " . $this->db->affectedRows() . " records.\n" );