Merge "i18n: Clarify the default sidebar 'Help' link is about MediaWiki itself" into...

diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index dc216dc..a123ae8 100644 (file)
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -46,6 +46,7 @@ THIS IS NOT A RELEASE YET
 * (T185049) LogFormatter: Fail softer when trying to link an invalid titles
 * (T210998) Properly set $wgLanguageCode in the generated LocalSettings.php
   if --lang is used with the command-line installer (install.php).
+* Fix addition of ug_expiry column to user_groups table on MSSQL.
 
 == MediaWiki 1.31.1 ==
 

diff --git a/maintenance/mssql/archives/patch-user_groups-ug_expiry.sql b/maintenance/mssql/archives/patch-user_groups-ug_expiry.sql
index 371d80b..4bafc8b 100644 (file)
--- a/maintenance/mssql/archives/patch-user_groups-ug_expiry.sql
+++ b/maintenance/mssql/archives/patch-user_groups-ug_expiry.sql
@@ -1,6 +1,6 @@
 -- Primary key and expiry column in user_groups table
 
 DROP INDEX IF EXISTS /*i*/ug_user_group ON /*_*/user_groups;
-ALTER TABLE /*_*/tag_summary ADD CONSTRAINT pk_user_groups PRIMARY KEY(ug_user, ug_group);
-ALTER TABLE /*_*/tag_summary ADD ug_expiry varchar(14) DEFAULT NULL;
+ALTER TABLE /*_*/user_groups ADD CONSTRAINT pk_user_groups PRIMARY KEY(ug_user, ug_group);
+ALTER TABLE /*_*/user_groups ADD ug_expiry varchar(14) DEFAULT NULL;
 CREATE INDEX /*i*/ug_expiry ON /*_*/user_groups(ug_expiry);