From: Reedy <reedy@wikimedia.org>
Date: Fri, 8 Sep 2017 06:28:40 +0000 (+0100)
Subject: Fix patchfile used to add newtalk table on mysql
X-Git-Tag: 1.31.0-rc.0~1928^2
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=c16b1e8191611ffd7f42557620ead71e131257b3

Fix patchfile used to add newtalk table on mysql

Remove orghaned patch-drop-user_newtalk.sql

Change-Id: I27ad5a628deedbab2e659200f003cdeb18ea3620
---

diff --git a/includes/installer/MysqlUpdater.php b/includes/installer/MysqlUpdater.php
index 2abc6b61db..c63c59cb06 100644
--- a/includes/installer/MysqlUpdater.php
+++ b/includes/installer/MysqlUpdater.php
@@ -83,7 +83,7 @@ class MysqlUpdater extends DatabaseUpdater {
 			[ 'doUserUniqueUpdate' ],
 			[ 'doUserGroupsUpdate' ],
 			[ 'addField', 'site_stats', 'ss_total_pages', 'patch-ss_total_articles.sql' ],
-			[ 'addTable', 'user_newtalk', 'patch-usernewtalk2.sql' ],
+			[ 'addTable', 'user_newtalk', 'patch-usernewtalk.sql' ],
 			[ 'addTable', 'transcache', 'patch-transcache.sql' ],
 			[ 'addField', 'interwiki', 'iw_trans', 'patch-interwiki-trans.sql' ],
 
diff --git a/maintenance/archives/patch-drop-user_newtalk.sql b/maintenance/archives/patch-drop-user_newtalk.sql
deleted file mode 100644
index 6ec84fb35d..0000000000
--- a/maintenance/archives/patch-drop-user_newtalk.sql
+++ /dev/null
@@ -1,3 +0,0 @@
--- Patch for email authentication T.Gries/M.Arndt 27.11.2004
--- Table user_newtalk is dropped, as the table watchlist is now also used for storing user_talk-page notifications
-DROP TABLE /*$wgDBprefix*/user_newtalk;