Update to LTS 1.43.5

It is USELESS

.eslintignore

@@ -17,6 +17,7 @@
 /tests/phpunit/data/registration/duplicate_keys.json
 /tests/phpunit/data/resourceloader/codex/
 /tests/phpunit/data/resourceloader/codex-devmode/
+/tests/phpunit/data/SelserContext/*.json
 /tests/phpunit/unit/includes/Settings/Source/fixtures/bad.json
 /tests/phpunit/**/*malformed*.json
 /maintenance/benchmarks/data/

.gitignore

@@ -91,3 +91,13 @@ Thumbs.db
 # Docker
 docker-compose.override.yml
 .env
+
+# TechInc not public
+secrets.php
+
+# TechInc extensions
+extensions/AdminLinks
+extensions/Headscript
+extensions/PageForms
+extensions/SemanticMediaWiki
+extensions/SemanticResultFormats

.phan/config.php

@@ -20,10 +20,9 @@
 
 $cfg = require __DIR__ . '/../vendor/mediawiki/mediawiki-phan-config/src/config.php';
 
-// Whilst MediaWiki is still supporting PHP 7.4+, this lets us run phan on higher versions of PHP
-// like 8.0 without phan trying to get us to make PHP 7.4-incompatible changes. This value should
-// match the PHP version specified in composer.json and PHPVersionCheck.php.
-$cfg['minimum_target_php_version'] = '7.4.3';
+// This value should match the PHP version specified in composer.json,
+// PHPVersionCheck.php, and ScopeStructureTest.php
+$cfg['minimum_target_php_version'] = '8.1.0';
 
 $cfg['file_list'] = array_merge(
 	$cfg['file_list'],

COPYING

@@ -42,8 +42,8 @@ available at https://creativecommons.org/policies#trademark
 
 Version 2, June 1991
 
-Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+<https://fsf.org/>
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.
 
@@ -56,7 +56,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
 When we speak of free software, we are referring to freedom, not
@@ -331,7 +331,6 @@ convey the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
 	<one line to give the program's name and a brief idea of what it does.>
-
 	Copyright (C) <year>  <name of author>
 
 	This program is free software; you can redistribute it and/or modify
@@ -344,10 +343,8 @@ the "copyright" line and a pointer to where the full notice is found.
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU General Public License for more details.
 
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-
+	You should have received a copy of the GNU General Public License along
+	with this program; if not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -371,12 +368,11 @@ necessary.  Here is a sample; alter the names:
 	Yoyodyne, Inc., hereby disclaims all copyright interest in the program
 	`Gnomovision' (which makes passes at compilers) written by James Hacker.
 
-	<signature of Ty Coon>, 1 April 1989
-
-	Ty Coon, President of Vice
+	<signature of Moe Ghoul>, 1 April 1989
+	Moe Ghoul, President of Vice
 
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
+library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.

INSTALL

@@ -25,6 +25,9 @@ Required software as of MediaWiki 1.43.0:
 ** PostgreSQL 10 or higher
 ** SQLite 3.8.0 or higher
 
+In addition, either the bcmath or gmp PHP extension is required on 32-bit
+systems.
+
 MediaWiki is developed and tested mainly on Unix/Linux platforms, but should
 work on Windows as well.
 

LocalSettings.php

@@ -0,0 +1,277 @@
+<?php
+# This is a template for the default config for the Technologia Incognita wiki.
+#
+# This is for Mediawiki version 1.43 LTS
+# Please add correct credentials where needed
+#
+# Maintained by Piele, Thijs
+# Version: 20250211
+
+# Protect against web entry
+if ( !defined( 'MEDIAWIKI' ) ) {
+  exit;
+}
+
+## Fix that ssl is always on
+$_SERVER['HTTPS'] = 'on';
+$_SERVER['SERVER_PORT'] = 443;
+
+##################### CUSTOMIZE THESE SETTINGS TO YOUR NEED ###################
+
+# Put some secrets outside the git repository
+include 'secrets.php';
+
+## Some site defaults
+$wgSitename = "Technologia Incognita";
+$wgMetaNamespace = "Technologia_Incognita";
+$wgServer = "https://wiki.techinc.nl";
+#$wgLogo = "https://wiki.techinc.nl/images/c/cd/Techinc_logo.png";
+$wgLogos = [
+	'svg' => "https://wiki.techinc.nl/images/6/6a/TechInc-logo-no-text.svg",		// path to svg version
+	'icon' => "https://wiki.techinc.nl/images/6/6a/TechInc-logo-no-text.svg",		// path to svg version
+];
+$wgLocaltimezone = "Europe/Amsterdam";
+
+## Database settings
+$wgDBtype = "mysql";
+$wgDBserver = "127.0.0.1";
+$wgDBname = "techinc_wiki";
+$wgDBuser = "techinc_wiki";
+$wgDBpassword = "gFCS8t19xNEvdg52Sx51asGpr4RESbSH";
+$wgDBprefix = "";
+
+
+# Email settings
+$wgEmergencyContact = "wiki-noreply@techinc.nl";
+$wgPasswordSender = "wiki-noreply@techinc.nl";
+$wgSMTP = [
+	'host' => 'ssl://mail.techinc.nl',
+	'IDHost' => 'wiki.techinc.nl',
+	'localhost' => 'wiki.techinc.nl',
+	'port' => 465,
+	'auth' => true,
+	'username' => 'wiki',
+	'password' => $emailPassword # In secrets.php
+];
+
+# tr -c -d '0123456789abcdef' </dev/urandom | dd bs=64 count=1 2>/dev/null;echo
+# $wgSecretKey = ""; # In secrets.php
+
+# Site upgrade key. Must be set to a string (default provided) to turn on the
+# web installer while LocalSettings.php is in place
+# tr -c -d '0123456789abcdef' </dev/urandom | dd bs=64 count=1 2>/dev/null;echo
+# $wgUpgradeKey = ""; # In secrets.php
+
+# Changing this will log out all existing sessions.
+$wgAuthenticationTokenVersion = "1";
+
+$wgUsePrivateIPs = true;
+$wgUseSquid = true;
+$wgSquidServers = array();
+$wgSquidServers[] = "127.0.0.1"; 
+
+#$wgSquidServers = array( '127.0.0.1', '5.79.113.102' );
+
+$wgUseCdn = true;
+$wgCdnServers = array();
+$wgCdnServers[] = "127.0.0.1";
+
+## PART FOR DEBUGGING, ALSO SET $wgUseSquid = false; when enabling this ##
+$wgShowExceptionDetails = true;
+$wgShowSQLErrors        = true;
+$wgDebugComments        = true;
+$wgLogQueries           = true;
+$wgDebugDumpSql         = true;
+$wgDevelopmentWarnings  = true;
+$wgDebugProfiling       = true;
+$wgDebugTimestamps      = true;
+$wgResourceLoaderDebug  = true;
+$wgDebugToolbar         = true;
+
+$wgFileExtensions = array('png','gif','jpg','jpeg','doc','xls','mpp','ppt','tiff','bmp','docx', 'xlsx','pptx','ps','odt','ods','odp','odg','svg','svgz','tar','gz','bzip','bz2','7z','ogg','mp3','wav','md','css','html','dxf','txt','pdf','dia');
+
+$wgSVGConverter = 'ImagickExt';
+$wgSVGNativeRendering = true;
+
+$wgDefaultSkin = "vector";
+#$wgSkipSkins = array( "vector-2022" );
+wfLoadSkin( 'Vector' );
+wfLoadSkin( 'MinervaNeue' );
+
+// For mobile visitors
+#wfLoadExtension( 'MobileFrontend' );
+#$wgDefaultMobileSkin = 'minerva';
+
+######################## END OF CUSTOMIZABLE AREA #############################
+#
+################ THESE VALUES SHOULD NOT HAVE TO BE CHANGED ###################
+$wgScriptPath = "";
+$wgArticlePath = "/$1";
+$wgUsePathInfo      = true;
+$wgScriptExtension  = ".php";
+$wgResourceBasePath = $wgScriptPath;
+
+## UPO means: this is also a user preference option
+$wgEnableEmail = true;
+$wgEnableUserEmail = true; # UPO
+$wgEnotifUserTalk = false; # UPO
+$wgEnotifWatchlist = false; # UPO
+$wgEmailAuthentication = true;
+
+# MySQL table options to use during installation or update
+$wgDBTableOptions = "ENGINE=InnoDB, DEFAULT CHARSET=utf8";
+
+# Experimental charset support for MySQL 5.0.
+$wgDBmysql5 = false;
+
+/////////////////////////////////// CACHING ///////////////////////////////////
+
+$wgMainCacheType = 'redis';
+$wgSessionCacheType = 'redis';  // same as WMF prod
+
+// Not widely tested:
+#$wgMessageCacheType = 'redis';
+$wgParserCacheType = 'redis';
+$wgLanguageConverterCacheType = 'redis';
+
+/** @see RedisBagOStuff for a full explanation of these options. **/
+$wgObjectCaches['redis'] = array(
+    'class'                => 'RedisBagOStuff',
+    'servers'              => array( '127.0.0.1:6379' ),
+    // 'connectTimeout'    => 1,
+    // 'persistent'        => false,
+    // 'password'          => 'secret',
+    // 'automaticFailOver' => true,
+);
+
+$wgJobTypeConf['default'] = [
+    'class'          => 'JobQueueRedis',
+    'redisServer'    => '127.0.0.1:6379',
+    'redisConfig'    => [],
+    'claimTTL'       => 3600,
+    'daemonized'     => true
+];
+
+$smwgCacheType = 'redis';
+$smwgQueryResultCacheType = 'redis';
+
+//////////////////////////////// END OF CACHING ///////////////////////////////
+
+$wgEnableUploads = true;
+$wgUseImageMagick = true;
+$wgImageMagickConvertCommand = "/usr/bin/convert";
+$wgShellLocale = "en_US.utf8";
+
+$wgUseInstantCommons = false;
+$wgPingback = false;
+$wgCacheDirectory = "$IP/cache";
+$wgLanguageCode = "en";
+
+$wgRightsPage = ""; # Set to the title of a wiki page that describes your license/copyright
+$wgRightsUrl = "";
+$wgRightsText = "";
+$wgRightsIcon = "";
+
+$wgDiff3 = "/usr/bin/diff3";
+
+########################## SETTINGS FOR EXTENSIONS ############################
+
+wfLoadExtension( 'AdminLinks' );
+#require_once( "$IP/extensions/Arrays/Arrays.php" );
+
+## ConfirmEdit / QuestyCaptcha settings
+wfLoadExtension( 'ConfirmEdit' );
+wfLoadExtension( 'ConfirmEdit/QuestyCaptcha' );
+
+## Start QuestyCaptcha block
+$wgCaptchaClass = 'QuestyCaptcha';
+
+/// CHANGE THIS TO SOMETHING REAL
+#$wgCaptchaQuestions[] = array( 'question' => 'Which animal is displayed here? <img src="http://wiki.mysite.com/dog.jpg" alt="" title="" />', 'answer' => 'dog' );
+$wgCaptchaQuestions[] = array( 'question' => 'Which city is the hackerspace located in?', 'answer' => 'Amsterdam' );
+## End QuestyCaptcha block
+
+$wgGroupPermissions['*'            ]['skipcaptcha'] = false;
+$wgGroupPermissions['user'         ]['skipcaptcha'] = false;
+$wgGroupPermissions['autoconfirmed']['skipcaptcha'] = false;
+$wgGroupPermissions['bot'          ]['skipcaptcha'] = true; // registered bots
+$wgGroupPermissions['sysop'        ]['skipcaptcha'] = true;
+
+$wgCaptchaTriggers['edit']          = false;
+$wgCaptchaTriggers['create']        = false;
+$wgCaptchaTriggers['addurl']        = false;
+$wgCaptchaTriggers['createaccount'] = true;
+$wgCaptchaTriggers['badlogin']      = true;
+
+wfLoadExtension( 'Nuke' );
+wfLoadExtension( 'ParserFunctions' );
+wfLoadExtension( 'TextExtracts' );
+wfLoadExtension( 'WikiEditor' );
+wfLoadExtension( 'PageForms' );
+wfLoadExtension( 'Headscript' );
+wfLoadExtension( 'SemanticMediaWiki' );
+wfLoadExtension( 'SemanticResultFormats' );
+
+$wgPFEnableStringFunctions = true;
+$wgGroupPermissions['*']['edit'] = false;
+
+$wgEnableDnsBlacklist = false;
+#$wgDnsBlacklistUrls = array( 'xbl.spamhaus.org', 'dnsbl.tornevall.org' );
+
+// optional: default is array( 'sysop' )
+//$wgUserMergeProtectedGroups = array( 'groupname' );
+
+// Semantic Media Wiki
+enableSemantics( 'techinc.nl' );
+$smwgPageSpecialProperties = array( '_MDAT', '_CDAT', '_NEWP', '_LEDT');
+$smwgCategoryFeatures = ( $smwgCategoryFeatures & ~SMW_CAT_REDIRECT );
+$srfgFirstDayOfWeek = 'Monday';
+#$smwgShowFactbox = SMW_FACTBOX_NONEMPTY;
+
+$wgPageForms24HourTime = true;
+$wgGroupPermissions['*']['viewedittab'] = false;
+
+#$wgPopupsBetaFeature = true;
+$wgPopupsOptInDefaultState = '1';
+
+$wgDefaultUserOptions['usebetatoolbar'] = 1;
+$wgDefaultUserOptions['usebetatoolbar-cgd'] = 1;
+$wgDefaultUserOptions['wikieditor-preview'] = 1;
+$wgDefaultUserOptions['wikieditor-publish'] = 1;
+
+
+$wgMSU_showAutoCat = true; // Files uploaded while editing a category page will be added to that category
+$wgMSU_checkAutoCat = true; // Whether the checkbox for adding a category to a page is checked by default
+
+#Disable for everyone.
+$wgGroupPermissions['*']['edit']              = false;
+# Disable for users, too: by default 'user' is allowed to edit, even if '*' is not.
+$wgGroupPermissions['user']['edit']           = false;
+# Make it so users with confirmed email addresses are in the group.
+$wgAutopromote['emailconfirmed']              = APCOND_EMAILCONFIRMED;
+# Hide group from user list. 
+$wgImplicitGroups[]                           = 'emailconfirmed';
+# Finally, set it to true for the desired group.
+$wgGroupPermissions['emailconfirmed']['edit'] = true;
+
+# This is uncommented whenever a backup is running
+#$wgReadOnly = 'A backup of the TechInc wiki is currently being made. The site is therefore in read-only mode. Check back in a bit.';
+#$wgMessageCacheType = $wgMainCacheType = $wgParserCacheType = $wgSessionCacheType = CACHE_NONE;
+#$wgLocalisationCacheConf['storeClass'] = 'LCStoreNull';
+#$wgIgnoreImageErrors = true;
+
+$wgHeadScriptCode = <<<'START_END_MARKER'
+<link href="spacestate.php" rel="stylesheet" />
+START_END_MARKER;
+
+// Remove all talk pages
+$wgNamespaceProtection[NS_TALK] = ['everyone'];
+$wgNamespaceProtection[NS_USER_TALK] = ['everyone'];
+$wgNamespaceProtection[NS_PROJECT_TALK] = ['everyone'];
+$wgNamespaceProtection[NS_FILE_TALK] = ['everyone'];
+$wgNamespaceProtection[NS_MEDIAWIKI_TALK] = ['everyone'];
+$wgNamespaceProtection[NS_TEMPLATE_TALK] = ['everyone'];
+$wgNamespaceProtection[NS_HELP_TALK] = ['everyone'];
+$wgNamespaceProtection[NS_CATEGORY_TALK] = ['everyone'];
+
+$wgMemoryLimit = "64M";

README.md

@@ -1,3 +1,35 @@
+# TechInc fork of MediaWiki
+
+To add the upstream repo
+
+```
+git remote add upstream https://gerrit.wikimedia.org/r/mediawiki/core.git
+```
+
+Make sure you track the correct upstream branch for the current release (`REL1_43` at the time of writing, an LTS release).
+
+To rebase our changes on top of the upstream codebase
+```
+git pull upstream --rebase --autostash
+```
+
+Make sure you update the submodules with
+```
+git submodule update --init --recursive
+```
+
+If you change any composer files, run
+```
+composer update
+```
+
+To update the MediaWiki database (*IMPORTANT*: do a backup beforehand!)
+```
+php maintenance/run.php update
+```
+
+
+
 # MediaWiki
 
 MediaWiki is a free and open-source wiki software package written in PHP. It

RELEASE-NOTES-1.43

@@ -4,16 +4,269 @@ PHP 8.1 workboard: https://phabricator.wikimedia.org/tag/php_8.1_support/
 PHP 8.2 workboard: https://phabricator.wikimedia.org/tag/php_8.2_support/
 PHP 8.3 workboard: https://phabricator.wikimedia.org/tag/php_8.3_support/
 PHP 8.4 workboard: https://phabricator.wikimedia.org/tag/php_8.4_support/
+PHP 8.5 workboard: https://phabricator.wikimedia.org/tag/php_8.5_support/
 
-== MediaWiki 1.43.1 ==
+== MediaWiki 1.43.6 ==
 
 THIS IS NOT A RELEASE YET
 
-=== Changes since MediaWiki 1.43.1 ===
-
+=== Changes since 1.43.5 ===
+* (T85085) Improve CSS checking in SVG filter.
 * Localisation updates.
+
+== MediaWiki 1.43.5 ==
+
+This is a security and maintenance release of the MediaWiki 1.43 branch.
+
+=== Changes since MediaWiki 1.43.4 ===
+* Add missing backport for Extension:DiscussionTools.
+* Add missing backport for Extension:Thanks.
+* (T406322, CVE-2025-11261) SECURITY: Escape system messages in
+  mw.language.listToText.
+
+== MediaWiki 1.43.4 ==
+
+This is a security and maintenance release of the MediaWiki 1.43 branch.
+
+=== Changes since MediaWiki 1.43.3 ===
+* Localisation updates.
+* Rest: Move ModuleConfigurationException into correct folder.
+* Cache: Move MessageCache hook interfaces into correct folder.
+* uppercaseTitlesForUnicodeTransition: Add missing return.
+* installer: Always check return of IDatabase::fieldInfo in postgres.
+* autoload: Expand Autoloader::CORE_NAMESPACES.
+* (T378163) mediawiki.page.ready: Fix undefined mw.user during temp user logout.
+* (T375530) Define and store MediaWiki REST API ‘page’ endpoint responses as
+  JSON schemas.
+* (T376603) REST: JSON schema definitions for additional response bodies.
+* (T399672) mime: Add mime types for *.less.
+* (T391180) docs: Add link to CORS setting for REST API.
+* (T388729) Parser: Handle regex failure in extractBody method.
+* (T399064) Parser::extractBody: Use possessive matcher and once-only
+  subpattern.
+* (T399793) PermissionManager: Fix missingPermissionError() not returning early
+  when $short is true.
+* rdbms: Fix GTID style detection for MySQL servers.
+* ParserCacheSerializationTestCases: back port ParserOutput changes from 1.45.
+* ParserCacheSerializationTestCases: distinguish empty ToC from missing ToC.
+* Fix attachLatest --regenerate-all creating invalid SQL command.
+* diff: Avoid Phan warning with some Wikidiff2 versions.
+* (T327439) ParserOutput: Prepare to allow JsonCodec serialization of TOCData.
+* media: Remove pass-by-ref in Exif::exifGPStoNumber.
+* (T386208) Exif: Handle malformed gps tags.
+* i18n: Add Special:MyLanguage to mediawiki.org links.
+* (T380423) Show user a human readable message when $wgLocaltimezone is set to
+  an invalid timezone.
+* maintenance: Fix sql for touched-only option of refreshLinks script.
+* (T393028) ImagePage: Remove PNG previews line for native SVG rendering.
+* (T374042) PostgresUpdater: Fix typo in sites_group index renaming instruction.
+* (T401088) maintenance: Fix paging in findMissingFiles.php.
+* (T401570) rdbms: Fix read-only detection for MariaDB 12.
+* (T400881) filerepo: Improve identification of ForeignAPIRepo requests.
+* (T397900) Don't use RequestContext in CommentParserFactory construction.
+* (T402037) config: Change Reauthenticate Time Default.
+* WebPHandler: Read all of the VP8L canvas height.
+* (T264389, T161647) Make Content JsonCodecable.
+* maintenance: Fix SQL range for moveToExternal.
+* Use JsonCodec to serialize SelserContext.
+* Forward-compat data for SelserContext w/ JSON-encoded Content.
+* (T372444, T404230) DeletedContribsPager: Use the UserIdentity object instead
+  of the raw target string.
+* (T401099, CVE-2025-61638) Upgrading wikimedia/parsoid (v0.20.3 => v0.20.4).
+* (T394968) Metadata: ignore LocationCreated, similar to LocationShown.
+* (T366083) OutputTransform: Fix double IDs on headings.
+* (T381617) Use Remex/HtmlHelper to implement Parser::replaceTableOfContents.
+* Re-apply "Use Remex for DeduplicateStyles transform".
+* (T400505) Regenerate patch-drop-page_restrictions-pr_user.sql for SQLite.
+* (T387478, CVE-2025-61634) SECURITY: REST: Set cache-control value of
+  max-age=60 for redirects.
+* (T394396, CVE-2025-61636) SECURITY: Escape rawElement $content.
+* (T394856, CVE-2025-61637) SECURITY: Escape three system messages used by
+  live preview.
+* (T401099, CVE-2025-61638) SECURITY: Sanitize data- attributes.
+* (T280413, CVE-2025-61639) SECURITY: Use ManualLogEntry::getDeleted in
+  ::getRecentChange.
+* (T402075, CVE-2025-61640) SECURITY: Parse messages instead of inserting
+  them as HTML.
+* (T298690, CVE-2025-61641) SECURITY: api: Disable maxsize in QueryAllPages
+  in miser mode.
+* (T402313, CVE-2025-61642) SECURITY: Escape submit button label for Codex-based
+  HTMLForms.
+* (T403757, CVE-2025-61643) SECURITY: Don't send suppressed recent changes to
+  RCFeeds.
+* (T398706, CVE-2025-61646) SECURITY: Prevent leaking hidden usernames in
+  Watchlist/RecentChanges.
+
+== MediaWiki 1.43.3 ==
+
+This is a maintenance release of the MediaWiki 1.43 branch.
+
+=== Changes since MediaWiki 1.43.2 ===
+* Localisation updates.
+* Fix test failures related to 1.43.2.
+* (T398269) Fixup vendor issues related to symfony/polyfill-php.
+
+== Mediawiki 1.43.2 ==
+
+This is a security and maintenance release of the MediaWiki 1.43 branch.
+
+=== Changes since MediaWiki 1.43.1 ===
+* Localisation updates.
+* (T388708) Diffs: avoid getContentHandler on null error.
+* filebackend: Avoid passing null to FileBackend::normalizeContainerPath.
+* (T390001) UploadBase: makeWarningsSerializable() should accept MessageParam
+  objects.
+* tests: Add test cases for UploadFromChunks.
+* (T382086) swagger-ui: Add licenses of packages used by Swagger UI bundle.
+* (T392086) specials: Fix PHP Warning on Special:PasswordReset for crafted
+  input.
+* (T386175, CVE-2025-32072) SECURITY: Escape newpage message in FeedUtils.
+* (T391179) installer: fix MySQL create user permissions check.
+* (T391169) INSTALL: Document requirement for bcmath/gmp on 32-bit systems.
+* (T389260) language: Avoid warning when 'namespaceGenderAliases' is null.
+* (T391867) http: Handle accept header with incomplete q.
+* Update Pingback address.
+* (T387684) filerepo: No exception on redirect without width in
+  ThumbnailEntryPoint.
+* (T393879) objectcache: Cast explicitly to integer.
+* tests: Use GLOB_BRACE in JsonSchemaAssertionTraitTest.
+* tests: Fix casing of MediaWiki in @covers.
+* (T394989) FormatMetadata::formatFraction: Don't risk passing null to
+  preg_match.
+* (T374314) Link mw.Uri migration guide in docs and log warnings.
+* (T395214) title: Reset cached Title objects between tests.
+* (T395214) phpunit: Remove superfluous Title::clearCaches() calls.
+* (T221560) Remove hyphens from legal search characters for MySQL-based database
+  searches.
+* (T393628) Use anonymous user when creating named account from temp account.
+* (T71997, T382963) Update RfC links to bypass redirect.
+* (T351055) Improve BrokenRedirects display.
+* (T382963) Sync up core repo with Parsoid.
+* (T382963) Update wikimedia/parsoid to 0.20.3.
+* (T395834) Treat File::getShortDesc() as possibly unsafe HTML.
+* tests: Match deprecation message under php8.4 in DeprecationHelperTest.
+* (T379445) debug: Migrate E_USER_ERROR to throw Error in DeprecationHelper.
+* (T221560) Setup: Switch vendor error from echo+E_USER_ERROR to echo+exit.
+* Setup: Update error message for composer dependencies check.
+* (T381341, T379445) widget: Remove outdated try/catch wrapper from
+  SpinnerWidget.
+* (T379445) phpunit: Remove unused trigger_error from TestLogger.
+* (T356451) logger: Make log() methods return void.
+* (T328921, T359868) Drop PHP 7.4/8.0 support from master (forward-port from MW
+  1.42).
+* Drop a few phan PhanImpossibleTypeComparison suppressions now we've dropped
+  PHP 7.4.
+* Clean up resource type and phan suppression in postgres code.
+* structure tests: allow PHP 8.1 syntax and autoload enums.
+* rdbms: fix table prefixing in "FOR UPDATE" clause generation in Postgres.
+* (T388406) RefreshLinksJob: Check hastext before comparing HTML.
+* (T397521) Api: Fix permission checks in action=compare.
+* (T397883, T397643) htmlform: fix min/max validations on empty input in
+  int/float fields.
+* specials: SpecialTalkPage: Use config from request context.
+* (T380456) exception: Avoid service container init in exception handler.
+* (T387408) exception: Skip use of HookRunner when not autoloaded.
+* (T397470) Remove feature flagged Swagger UI based Special:RestSandbox.
+* (T391343, CVE-2025-6589) SECURITY: BlockList: Hide rows containing suppressed
+  users.
+* (T392746, CVE-2025-6590) SECURITY: Escape usernames in HTMLUserTextField
+  validation errors.
+* (T392276, CVE-2025-6591) SECURITY: API: Escape i18n messages in
+  action=feedcontributions.
+* (T396230, T31856, CVE-2025-6593) SECURITY: fix IP leak to unverified email.
+* (T395063, CVE-2025-6594) SECURITY: apisandbox: Fix reflected XSS when invalid
+  'format' is provided.
+* (T389009, CVE-2025-6597) SECURITY: Do not treat autocreation as login for
+  reauthentication.
+* (T389010, CVE-2025-6926) SECURITY: Allow extensions to supress the reauth
+  flag on login.
+* (T397595, CVE-2025-6927) SECURITY: Fix autoblocks visibility when
+  bl_deleted=1.
+* (T397595, CVE-2025-6927) SECURITY: Fix leak of hidden usernames via autoblocks
+  of those users.
+
+== MediaWiki 1.43.1 ==
+
+This is a security and maintenance release of the MediaWiki 1.43 branch.
+
+=== Changes since MediaWiki 1.43.0 ===
+* Localisation updates.
+* (T375707) exception: Convert E_STRICT errors to E_USER_NOTICE.
+* (T380755) session: Do not set session.use_trans_sid.
 * (T382987) $wgDnsBlacklistUrls now defaults to an empty array. See the comment
   in the "Configuration changes for system administrators" section.
+* (T383037) MimeMap: add gltf and glb mime types.
+* (T383037) MimeAnalyzer: detect magic number for gltf binary.
+* Commit swagger-ui's NOTICE.
+* (T382484) dumps: Use proc_close() to close proc_open() subprocess.
+* (T375707) MWExceptionHandler: Add error suppression to constant( 'E_STRICT' ).
+* (T384879) FormatMetadata: Prevent running preg_match() on null.
+* (T384995) specialpage: Improve handling of invalid lang codes on login/signup.
+* (T385055) resourceloader: Fix hash computation for virtual files with
+  versionFilePath.
+* (T385169) MultiUsernameFilter: Don't try to split ids if they're not a string.
+* (T385567) parser: Gracefully handle invalid ParsoidRenderID keys.
+* (T385568) rest: Return a 400 for invalid render IDs.
+* (T383646) installer: Simplify the information box.
+* (T384524) installer: Fix conflation between warning and info messages.
+* (T376711) language: Use fallback chain to create NumberFormatter.
+* (T384524) installer: Restore success messages.
+* (T384524) installer: Restore "complete" success message.
+* (T385332) feeds: Fix str_replace() deprecation warnings on PHP 8.
+* (T386891) Revert "maintenance: Use DatabaseSqlite for type-hinting instead of
+  DBConnRef".
+* (T381205) Add explanation text for "Allow emails from brand-new users".
+* (T380880) ExternalLinks: fix mailto: links reversal.
+* (T381033) RateLimiter: Fix peek mode.
+* initEditCount: Join from user to actor to revision.
+* (T387130,CVE-2025-32699) SECURITY: Update wikimedia/parsoid to 0.20.2.
+* (T385519) Sanitizer::normalizeWhitespace warn on preg_replace error.
+* (T387638) RevDelList: Ensure setVisibility always includes itemStatuses in
+  value if applicable.
+* (T388296) ImportImages: Exit with non-zero code if import fails.
+* Request: Improve log message when headers already sent.
+* (T386368, T387397) REST page metadata endpoints: handle supressed data
+  gracefully.
+* (T388066) Avoid trying to load the session user in MW_NO_SESSION endpoints.
+* (T388171) HttpError: Cast Message to string.
+* (T384197) permissions: Avoid potential infinite loop if BlockDisablesLogin =
+  true.
+* (T388255) ApiLogin: Don't break BotPasswords if password or user is blank,
+  just error.
+* (T388924) MagicWord::replace*: Make sure we don't pass null into preg_match/
+  preg_replace.
+* (T388944) Html: Fix "substr(): Passing null to parameter #1 ($string) of type
+  string is deprecated".
+* (T388728, T385519) Sanitizer::normalizeSectionNameWhitespace: Apply same
+  anti-null fix as 270499b.
+* (T387690) upload: Suppress warnings from iconv().
+* (T388733) Sanitizer::normalizeWhitespace: simplify redundant preg_replace.
+* (T315573) Fix GREATEST usage in site_stats.
+* (T304474, CVE-2025-32696) SECURITY: Apply proper restrictions on file revert
+  action.
+* (T24521, T62109, T140010, CVE-2025-32697) SECURITY: PermissionManager:
+  Differentiate between cascading protection of file content and file pages.
+* (T387507) ResourceLoader: update wikimedia/minify from 2.8.0 to 2.8.1.
+* (T388273, T388335) Upgrading pear/net_url2 (v2.2.2 => v2.2.3).
+* (T390063, T277675) ResourceLoader: update wikimedia/minify to 2.9.0.
+* (T384851) FileBackend: PHP Deprecated: strrpos(): Passing null to parameter #1
+  ($haystack).
+* (T378622) Parameterize ChangeTags::buildTagFilterSelector to support various
+  tag sets.
+* (T344352) ChangeTags: Optimize label and description parsing.
+* In .htaccess deny files, use "Satisfy All".
+* (T322672, T387478) REST: Remove unused setUseParserCache() as potential
+  footgun.
+* (T389028) block: Fix DBS::acquireTarget() race using GET_LOCK().
+* (T388807) LanguageConverter: Only set mTablesLoaded once they're really
+  loaded.
+* RestrictionStore: Remove short-circuit mode when fetching cascading sources.
+* (T385958, CVE-2025-32698) SECURITY: LogPager.php: Restriction enforcer
+  functions do not correctly enforce suppression restrictions.
+* (T387130, CVE-2025-32699) SECURITY: Potential javascript injection attack
+  enabled by Unicode normalization in Action API.
+* (T358689, CVE-2025-3469) SECURITY: i18n XSS vulnerability in
+  HTMLMultiSelectField when sections are used.
 
 == MediaWiki 1.43.0 ==
 
@@ -246,7 +499,7 @@ For notes on 1.42.x and older releases, see HISTORY.
 * Updated wikimedia/at-ease from 2.1.0 to 3.0.0.
 * Updated wikimedia/json-codec from 3.0.1 to 3.0.3.
 * Updated wikimedia/less.php from 4.2.1 to 5.1.2.
-* Updated wikimedia/minify from 2.7.0 to 2.8.0.
+* Updated wikimedia/minify from 2.7.0 to 2.9.0.
 * Updated wikimedia/normalized-exception from 1.0.1 to 2.0.0.
 * Updated wikimedia/php-session-serializer from 2.0.1 to 3.0.0.
 * Updated wikimedia/purtle from 1.0.8 to 2.0.0.

autoload.php

@@ -1075,10 +1075,10 @@ $wgAutoloadLocalClasses = [
 	'MediaWiki\\Cache\\Hook\\HTMLFileCache__useFileCacheHook' => __DIR__ . '/includes/cache/Hook/HTMLFileCache__useFileCacheHook.php',
 	'MediaWiki\\Cache\\Hook\\HtmlCacheUpdaterAppendUrlsHook' => __DIR__ . '/includes/cache/Hook/HtmlCacheUpdaterAppendUrlsHook.php',
 	'MediaWiki\\Cache\\Hook\\HtmlCacheUpdaterVaryUrlsHook' => __DIR__ . '/includes/cache/Hook/HtmlCacheUpdaterVaryUrlsHook.php',
-	'MediaWiki\\Cache\\Hook\\MessageCacheFetchOverridesHook' => __DIR__ . '/includes/language/Hook/MessageCacheFetchOverridesHook.php',
-	'MediaWiki\\Cache\\Hook\\MessageCacheReplaceHook' => __DIR__ . '/includes/language/Hook/MessageCacheReplaceHook.php',
-	'MediaWiki\\Cache\\Hook\\MessageCache__getHook' => __DIR__ . '/includes/language/Hook/MessageCache__getHook.php',
-	'MediaWiki\\Cache\\Hook\\MessagesPreLoadHook' => __DIR__ . '/includes/language/Hook/MessagesPreLoadHook.php',
+	'MediaWiki\\Cache\\Hook\\MessageCacheFetchOverridesHook' => __DIR__ . '/includes/cache/Hook/MessageCacheFetchOverridesHook.php',
+	'MediaWiki\\Cache\\Hook\\MessageCacheReplaceHook' => __DIR__ . '/includes/cache/Hook/MessageCacheReplaceHook.php',
+	'MediaWiki\\Cache\\Hook\\MessageCache__getHook' => __DIR__ . '/includes/cache/Hook/MessageCache__getHook.php',
+	'MediaWiki\\Cache\\Hook\\MessagesPreLoadHook' => __DIR__ . '/includes/cache/Hook/MessagesPreLoadHook.php',
 	'MediaWiki\\Cache\\LinkBatch' => __DIR__ . '/includes/cache/LinkBatch.php',
 	'MediaWiki\\Cache\\LinkBatchFactory' => __DIR__ . '/includes/cache/LinkBatchFactory.php',
 	'MediaWiki\\Cache\\LinkCache' => __DIR__ . '/includes/cache/LinkCache.php',
@@ -1142,6 +1142,7 @@ $wgAutoloadLocalClasses = [
 	'MediaWiki\\Content\\Content' => __DIR__ . '/includes/content/Content.php',
 	'MediaWiki\\Content\\ContentHandler' => __DIR__ . '/includes/content/ContentHandler.php',
 	'MediaWiki\\Content\\ContentHandlerFactory' => __DIR__ . '/includes/content/ContentHandlerFactory.php',
+	'MediaWiki\\Content\\ContentJsonCodec' => __DIR__ . '/includes/content/ContentJsonCodec.php',
 	'MediaWiki\\Content\\ContentModelChange' => __DIR__ . '/includes/content/ContentModelChange.php',
 	'MediaWiki\\Content\\CssContent' => __DIR__ . '/includes/content/CssContent.php',
 	'MediaWiki\\Content\\CssContentHandler' => __DIR__ . '/includes/content/CssContentHandler.php',
@@ -1873,6 +1874,7 @@ $wgAutoloadLocalClasses = [
 	'MediaWiki\\OutputTransform\\Stages\\HandleParsoidSectionLinks' => __DIR__ . '/includes/OutputTransform/Stages/HandleParsoidSectionLinks.php',
 	'MediaWiki\\OutputTransform\\Stages\\HandleSectionLinks' => __DIR__ . '/includes/OutputTransform/Stages/HandleSectionLinks.php',
 	'MediaWiki\\OutputTransform\\Stages\\HandleTOCMarkers' => __DIR__ . '/includes/OutputTransform/Stages/HandleTOCMarkers.php',
+	'MediaWiki\\OutputTransform\\Stages\\HardenNFC' => __DIR__ . '/includes/OutputTransform/Stages/HardenNFC.php',
 	'MediaWiki\\OutputTransform\\Stages\\HydrateHeaderPlaceholders' => __DIR__ . '/includes/OutputTransform/Stages/HydrateHeaderPlaceholders.php',
 	'MediaWiki\\OutputTransform\\Stages\\ParsoidLocalization' => __DIR__ . '/includes/OutputTransform/Stages/ParsoidLocalization.php',
 	'MediaWiki\\OutputTransform\\Stages\\RenderDebugInfo' => __DIR__ . '/includes/OutputTransform/Stages/RenderDebugInfo.php',
@@ -2253,7 +2255,7 @@ $wgAutoloadLocalClasses = [
 	'MediaWiki\\Rest\\Module\\MatcherBasedModule' => __DIR__ . '/includes/Rest/Module/MatcherBasedModule.php',
 	'MediaWiki\\Rest\\Module\\Module' => __DIR__ . '/includes/Rest/Module/Module.php',
 	'MediaWiki\\Rest\\Module\\SpecBasedModule' => __DIR__ . '/includes/Rest/Module/SpecBasedModule.php',
-	'MediaWiki\\Rest\\PathTemplateMatcher\\ModuleConfigurationException' => __DIR__ . '/includes/Rest/Module/ModuleConfigurationException.php',
+	'MediaWiki\\Rest\\PathTemplateMatcher\\ModuleConfigurationException' => __DIR__ . '/includes/Rest/PathTemplateMatcher/ModuleConfigurationException.php',
 	'MediaWiki\\Rest\\PathTemplateMatcher\\PathConflict' => __DIR__ . '/includes/Rest/PathTemplateMatcher/PathConflict.php',
 	'MediaWiki\\Rest\\PathTemplateMatcher\\PathMatcher' => __DIR__ . '/includes/Rest/PathTemplateMatcher/PathMatcher.php',
 	'MediaWiki\\Rest\\PathTemplateMatcher\\PathSegmentException' => __DIR__ . '/includes/Rest/PathTemplateMatcher/PathSegmentException.php',
@@ -2568,7 +2570,6 @@ $wgAutoloadLocalClasses = [
 	'MediaWiki\\Specials\\SpecialRemoveCredentials' => __DIR__ . '/includes/specials/SpecialRemoveCredentials.php',
 	'MediaWiki\\Specials\\SpecialRenameUser' => __DIR__ . '/includes/specials/SpecialRenameUser.php',
 	'MediaWiki\\Specials\\SpecialResetTokens' => __DIR__ . '/includes/specials/SpecialResetTokens.php',
-	'MediaWiki\\Specials\\SpecialRestSandbox' => __DIR__ . '/includes/specials/SpecialRestSandbox.php',
 	'MediaWiki\\Specials\\SpecialRevisionDelete' => __DIR__ . '/includes/specials/SpecialRevisionDelete.php',
 	'MediaWiki\\Specials\\SpecialRunJobs' => __DIR__ . '/includes/specials/SpecialRunJobs.php',
 	'MediaWiki\\Specials\\SpecialSearch' => __DIR__ . '/includes/specials/SpecialSearch.php',
@@ -2660,6 +2661,7 @@ $wgAutoloadLocalClasses = [
 	'MediaWiki\\Title\\TitleFormatter' => __DIR__ . '/includes/title/TitleFormatter.php',
 	'MediaWiki\\Title\\TitleParser' => __DIR__ . '/includes/title/TitleParser.php',
 	'MediaWiki\\Title\\TitleValue' => __DIR__ . '/includes/title/TitleValue.php',
+	'MediaWiki\\Upload\\SVGCSSChecker' => __DIR__ . '/includes/upload/SVGCSSChecker.php',
 	'MediaWiki\\User\\ActorCache' => __DIR__ . '/includes/user/ActorCache.php',
 	'MediaWiki\\User\\ActorMigration' => __DIR__ . '/includes/user/ActorMigration.php',
 	'MediaWiki\\User\\ActorMigrationBase' => __DIR__ . '/includes/user/ActorMigrationBase.php',

cache/.htaccess

@@ -1 +1,2 @@
 Require all denied
+Satisfy All

composer.json

@@ -22,7 +22,6 @@
 	"prefer-stable": true,
 	"require": {
 		"composer/semver": "3.4.3",
-		"cssjanus/cssjanus": "2.3.0",
 		"ext-calendar": "*",
 		"ext-ctype": "*",
 		"ext-dom": "*",
@@ -49,10 +48,10 @@
 		"psr/http-message": "1.1",
 		"psr/log": "1.1.4",
 		"ralouphie/getallheaders": "3.0.3",
-		"symfony/polyfill-php80": "1.31.0",
-		"symfony/polyfill-php81": "1.31.0",
 		"symfony/polyfill-php82": "1.31.0",
 		"symfony/polyfill-php83": "1.31.0",
+		"symfony/polyfill-php84": "1.32.0",
+		"symfony/polyfill-php85": "1.33.0",
 		"symfony/yaml": "5.4.45",
 		"wikimedia/assert": "0.5.1",
 		"wikimedia/at-ease": "3.0.0",
@@ -62,14 +61,16 @@
 		"wikimedia/cldr-plural-rule-parser": "2.0.0",
 		"wikimedia/common-passwords": "0.5.0",
 		"wikimedia/composer-merge-plugin": "2.1.0",
+		"wikimedia/css-sanitizer": "^5.1.0 || ^5.2.0 || ^5.3.0 || ^5.4.0",
+		"wikimedia/cssjanus": "2.3.0",
 		"wikimedia/html-formatter": "4.1.0",
 		"wikimedia/ip-utils": "5.0.0",
 		"wikimedia/json-codec": "3.0.3",
 		"wikimedia/less.php": "5.1.2",
-		"wikimedia/minify": "2.8.0",
+		"wikimedia/minify": "2.9.0",
 		"wikimedia/normalized-exception": "2.0.0",
 		"wikimedia/object-factory": "5.0.1",
-		"wikimedia/parsoid": "0.20.1",
+		"wikimedia/parsoid": "0.20.4",
 		"wikimedia/php-session-serializer": "3.0.0",
 		"wikimedia/purtle": "2.0.0",
 		"wikimedia/relpath": "4.0.1",
@@ -97,7 +98,7 @@
 		"mediawiki/mediawiki-codesniffer": "45.0.0",
 		"mediawiki/mediawiki-phan-config": "0.14.0",
 		"mediawiki/minus-x": "1.1.3",
-		"nikic/php-parser": "^4.10.2",
+		"nikic/php-parser": "^5.5.0",
 		"php-parallel-lint/php-console-highlighter": "1.0.0",
 		"php-parallel-lint/php-parallel-lint": "1.4.0",
 		"phpunit/phpunit": "9.6.19",
@@ -112,7 +113,9 @@
 		"symfony/polyfill-ctype": "1.99",
 		"symfony/polyfill-intl-grapheme": "1.17.1",
 		"symfony/polyfill-intl-normalizer": "1.17.1",
-		"symfony/polyfill-mbstring": "1.99"
+		"symfony/polyfill-mbstring": "1.99",
+		"symfony/polyfill-php80": "1.99",
+		"symfony/polyfill-php81": "1.99"
 	},
 	"suggest": {
 		"ext-apcu": "Faster web responses overall.",

composer.local.json

@@ -0,0 +1,69 @@
+{
+  "config": {
+    "allow-plugins": {
+      "wikimedia/composer-merge-plugin": true
+    }
+  },
+  "require": {
+    "mediawiki/semantic-media-wiki": "~6.0.0",
+    "mediawiki/semantic-result-formats": "dev-master#fd6dfd804bf44d5923a1527be9a1f6e421e08456",
+    "mediawiki/admin-links": "dev-master#4cec145ad82dbea4e0155bf9abc0ae566547da7b",
+    "mediawiki/page-forms": "dev-master#d8109745866f0860f66aecd31e009b68e5bedaf1",
+    "x-mediawiki/mobile-frontend": "^1.43",
+    "x-mediawiki/confirm-edit": "^1.43",
+    "x-mediawiki/headscript": "^1.43"
+  },
+  "repositories": [
+    {
+      "type": "vcs",
+      "url": "https://gerrit.wikimedia.org/r/mediawiki/extensions/AdminLinks.git"
+    },
+    {
+      "type": "package",
+      "package": {
+        "name": "x-mediawiki/mobile-frontend",
+        "type": "mediawiki-extension",
+        "version": "1.43.0",
+        "source": {
+          "type": "git",
+          "url": "https://gerrit.wikimedia.org/r/mediawiki/extensions/MobileFrontend.git",
+          "reference": "REL1_43"
+        }
+      }
+    },
+    {
+      "type": "package",
+      "package": {
+        "name": "x-mediawiki/confirm-edit",
+        "type": "mediawiki-extension",
+        "version": "1.43.0",
+        "source": {
+          "type": "git",
+          "url": "https://gerrit.wikimedia.org/r/mediawiki/extensions/ConfirmEdit.git",
+          "reference": "REL1_43"
+        }
+      }
+    },
+    {
+      "type": "package",
+      "package": {
+        "name": "x-mediawiki/headscript",
+        "type": "mediawiki-extension",
+        "version": "1.43.0",
+        "source": {
+          "type": "git",
+          "url": "https://gerrit.wikimedia.org/r/mediawiki/extensions/HeadScript.git",
+          "reference": "REL1_43"
+        }
+      }
+    }
+  ],
+  "extra": {
+    "merge-plugin": {
+      "include": [
+        "extensions/Nuke/composer.json",
+        "skins/*/composer.json"
+      ]
+    }
+  }
+}

docs/config-schema.yaml

@@ -4516,7 +4516,7 @@ config-schema:
             @since 1.36
     ReauthenticateTime:
         default:
-            default: 300
+            default: 3600
         type: object
         additionalProperties:
             type: integer
@@ -7745,26 +7745,6 @@ config-schema:
         description: |-
             Additional REST API Route files.
             A common usage is to enable development/experimental endpoints only on test wikis.
-    RestSandboxSpecs:
-        default: {  }
-        type: object
-        additionalProperties:
-            type: object
-            properties: { url: { type: string, format: url }, name: { type: string }, msg: { type: string, description: 'a message key' } }
-            required: [url]
-        description: |-
-            A list of OpenAPI specs to be made available for exploration on
-            Special:RestSandbox. If none are given, Special:RestSandbox is disabled.
-            This is an associative array, arbitrary spec IDs to spec descriptions.
-            Each spec description is an array with the following keys:
-            - url: the URL that will return the OpenAPI spec.
-            - name: the name of the API, to be shown on Special:RestSandbox.
-              Ignored if msg is given.
-            - msg: a message key for the name of the API, to be shown on
-              Special:RestSandbox.
-            @unstable Introduced in 1.43. We may want to rename or change this to
-            accommodate the need to list external APIs in a central discovery
-            document.
     MaxShellMemory:
         default: 307200
         description: 'Maximum amount of virtual memory available to shell processes under linux, in KiB.'
@@ -8028,7 +8008,7 @@ config-schema:
             For details about what data is sent, see: https://www.mediawiki.org/wiki/Manual:$wgPingback
             For the pingback privacy policy, see:
             https://wikimediafoundation.org/wiki/MediaWiki_Pingback_Privacy_Statement
-            Aggregate pingback data is available at: https://pingback.wmflabs.org/
+            Aggregate pingback data is available at: https://pingback.wmcloud.org/
             @since 1.28
     OriginTrials:
         default: []

docs/config-vars.php

@@ -4226,12 +4226,6 @@ $wgAllowedCorsHeaders = null;
  */
 $wgRestAPIAdditionalRouteFiles = null;
 
-/**
- * Config variable stub for the RestSandboxSpecs setting, for use by phpdoc and IDEs.
- * @see MediaWiki\MainConfigSchema::RestSandboxSpecs
- */
-$wgRestSandboxSpecs = null;
-
 /**
  * Config variable stub for the MaxShellMemory setting, for use by phpdoc and IDEs.
  * @see MediaWiki\MainConfigSchema::MaxShellMemory

extensions/MobileFrontend

@@ -0,0 +1 @@
+Subproject commit c608823de18308908f75052734529f0f9c8d354f

includes/.htaccess

@@ -1 +1,2 @@
 Require all denied
+Satisfy All

includes/AutoLoader.php

@@ -46,48 +46,99 @@ class AutoLoader {
 		'MediaWiki\\Block\\' => __DIR__ . '/block/',
 		'MediaWiki\\Cache\\' => __DIR__ . '/cache/',
 		'MediaWiki\\ChangeTags\\' => __DIR__ . '/changetags/',
+		'MediaWiki\\Collation\\' => __DIR__ . '/collation/',
 		'MediaWiki\\Composer\\' => __DIR__ . '/composer/',
 		'MediaWiki\\Config\\' => __DIR__ . '/config/',
 		'MediaWiki\\Content\\' => __DIR__ . '/content/',
+		'MediaWiki\\Context\\' => __DIR__ . '/context/',
+		'MediaWiki\\DAO\\' => __DIR__ . '/dao/',
 		'MediaWiki\\DB\\' => __DIR__ . '/db/',
+		'MediaWiki\\Debug\\' => __DIR__ . '/debug/',
 		'MediaWiki\\Deferred\\' => __DIR__ . '/deferred/',
 		'MediaWiki\\Deferred\\LinksUpdate\\' => __DIR__ . '/deferred/LinksUpdate/',
 		'MediaWiki\\Diff\\' => __DIR__ . '/diff/',
 		'MediaWiki\\EditPage\\' => __DIR__ . '/editpage/',
 		'MediaWiki\\Edit\\' => __DIR__ . '/edit/',
+		'MediaWiki\\Exception\\' => __DIR__ . '/exception/',
+		'MediaWiki\\Export\\' => __DIR__ . '/export/',
+		'MediaWiki\\FileBackend\\' => __DIR__ . '/filebackend/',
+		'MediaWiki\\FileBackend\\FSFile\\' => __DIR__ . '/libs/filebackend/fsfile/',
 		'MediaWiki\\FileBackend\\LockManager\\' => __DIR__ . '/filebackend/lockmanager/',
+		'MediaWiki\\FileRepo\\' => __DIR__ . '/filerepo/',
+		'MediaWiki\\FileRepo\\File\\' => __DIR__ . '/filerepo/file/',
+		'MediaWiki\\HTMLForm\\' => __DIR__ . '/htmlform/',
+		'MediaWiki\\HTMLForm\\Field\\' => __DIR__ . '/htmlform/fields/',
 		'MediaWiki\\Http\\' => __DIR__ . '/http/',
 		'MediaWiki\\Installer\\' => __DIR__ . '/installer/',
 		'MediaWiki\\Interwiki\\' => __DIR__ . '/interwiki/',
 		'MediaWiki\\JobQueue\\' => __DIR__ . '/jobqueue/',
+		'MediaWiki\\JobQueue\\Exceptions\\' => __DIR__ . '/jobqueue/exception/',
+		'MediaWiki\\JobQueue\\Jobs\\' => __DIR__ . '/jobqueue/jobs/',
+		'MediaWiki\\JobQueue\\Utils\\' => __DIR__ . '/jobqueue/utils/',
 		'MediaWiki\\Json\\' => __DIR__ . '/json/',
+		'MediaWiki\\Languages\\' => __DIR__ . '/language/',
 		'MediaWiki\\Languages\\Data\\' => __DIR__ . '/languages/data/',
+		'MediaWiki\\Language\\' => __DIR__ . '/language/',
+		'MediaWiki\\Libs\\' => __DIR__ . '/libs/',
+		'MediaWiki\\LinkedData\\' => __DIR__ . '/linkeddata/',
 		'MediaWiki\\Linker\\' => __DIR__ . '/linker/',
 		'MediaWiki\\Logger\\' => __DIR__ . '/debug/logger/',
 		'MediaWiki\\Logger\\Monolog\\' => __DIR__ . '/debug/logger/monolog/',
+		'MediaWiki\\Logging\\' => __DIR__ . '/logging/',
 		'MediaWiki\\Mail\\' => __DIR__ . '/mail/',
+		'MediaWiki\\Maintenance\\' => __DIR__ . '/../maintenance/includes/',
 		'MediaWiki\\Page\\' => __DIR__ . '/page/',
 		'MediaWiki\\Parser\\' => __DIR__ . '/parser/',
 		'MediaWiki\\Password\\' => __DIR__ . '/password/',
 		'MediaWiki\\PoolCounter\\' => __DIR__ . '/poolcounter/',
 		'MediaWiki\\Preferences\\' => __DIR__ . '/preferences/',
+		'MediaWiki\\Profiler\\' => __DIR__ . '/profiler/',
 		'MediaWiki\\RCFeed\\' => __DIR__ . '/recentchanges/RCFeed/',
+		'MediaWiki\\RecentChanges\\' => __DIR__ . '/recentchanges/',
+		'MediaWiki\\Registration\\' => __DIR__ . '/registration/',
+		'MediaWiki\\RevisionList\\' => __DIR__ . '/revisionlist/',
 		'MediaWiki\\Search\\' => __DIR__ . '/search/',
 		'MediaWiki\\Search\\SearchWidgets\\' => __DIR__ . '/search/searchwidgets/',
 		'MediaWiki\\Session\\' => __DIR__ . '/session/',
 		'MediaWiki\\Shell\\' => __DIR__ . '/shell/',
 		'MediaWiki\\Site\\' => __DIR__ . '/site/',
+		'MediaWiki\\Skin\\' => __DIR__ . '/skins/',
 		'MediaWiki\\Sparql\\' => __DIR__ . '/sparql/',
 		'MediaWiki\\SpecialPage\\' => __DIR__ . '/specialpage/',
-		'MediaWiki\\Specials\\Contribute\\' => __DIR__ . '/specials/Contribute',
+		'MediaWiki\\Specials\\' => __DIR__ . '/specials/',
+		'MediaWiki\\Specials\\Contribute\\' => __DIR__ . '/specials/Contribute/',
+		'MediaWiki\\Specials\\Redirects\\' => __DIR__ . '/specials/redirects/',
 		'MediaWiki\\Tidy\\' => __DIR__ . '/tidy/',
+		'MediaWiki\\Title\\' => __DIR__ . '/title/',
 		'MediaWiki\\User\\' => __DIR__ . '/user/',
 		'MediaWiki\\Utils\\' => __DIR__ . '/utils/',
+		'MediaWiki\\Watchlist\\' => __DIR__ . '/watchlist/',
 		'MediaWiki\\Widget\\' => __DIR__ . '/widget/',
+		'MediaWiki\\Xml\\' => __DIR__ . '/xml/',
 		'Wikimedia\\' => __DIR__ . '/libs/',
+		'Wikimedia\\ArrayUtils\\' => __DIR__ . '/libs/',
 		'Wikimedia\\Composer\\' => __DIR__ . '/libs/composer/',
+		'Wikimedia\\DependencyStore\\' => __DIR__ . '/ResourceLoader/dependencystore/',
+		'Wikimedia\\EventRelayer\\' => __DIR__ . '/libs/eventrelayer/',
+		'Wikimedia\\FileBackend\\' => __DIR__ . '/libs/filebackend/',
+		'Wikimedia\\FileBackend\\FileIteration\\' => __DIR__ . '/libs/filebackend/fileiteration/',
+		'Wikimedia\\FileBackend\\FileOpHandle\\' => __DIR__ . '/libs/filebackend/fileophandle/',
+		'Wikimedia\\FileBackend\\FileOps\\' => __DIR__ . '/libs/filebackend/fileop/',
+		'Wikimedia\\FileBackend\\FSFile\\' => __DIR__ . '/libs/filebackend/fsfile/',
+		'Wikimedia\\HashRing\\' => __DIR__ . '/libs/',
+		'Wikimedia\\HtmlArmor\\' => __DIR__ . '/libs/',
 		'Wikimedia\\Http\\' => __DIR__ . '/libs/http/',
+		'Wikimedia\\LightweightObjectStore\\' => __DIR__ . '/libs/objectcache/utils/',
+		'Wikimedia\\MapCacheLRU\\' => __DIR__ . '/libs/',
+		'Wikimedia\\Mime\\' => __DIR__ . '/libs/mime/',
+		'Wikimedia\\NonSerializable\\' => __DIR__ . '/libs/',
+		'Wikimedia\\ObjectCache\\' => __DIR__ . '/libs/objectcache/',
+		'Wikimedia\\Rdbms\\Database\\' => __DIR__ . '/libs/rdbms/database/',
 		'Wikimedia\\Rdbms\\Platform\\' => __DIR__ . '/libs/rdbms/platform/',
+		'Wikimedia\\Rdbms\\Replication\\' => __DIR__ . '/libs/rdbms/database/replication/',
+		'Wikimedia\\StringUtils\\' => __DIR__ . '/libs/',
+		'Wikimedia\\Telemetry\\' => __DIR__ . '/libs/telemetry/',
+		'Wikimedia\\Timing\\' => __DIR__ . '/libs/',
 		'Wikimedia\\UUID\\' => __DIR__ . '/libs/uuid/',
 	];
 

includes/Category/TrackingCategories.php

@@ -88,6 +88,7 @@ class TrackingCategories {
 		'unstrip-depth-category',
 		'unstrip-size-category',
 		'bad-language-code-category',
+		'bad-double-underscore-category',
 		'double-px-category',
 	];
 

includes/CommentFormatter/CommentParserFactory.php

@@ -4,6 +4,7 @@ namespace MediaWiki\CommentFormatter;
 
 use MediaWiki\Cache\LinkBatchFactory;
 use MediaWiki\Cache\LinkCache;
+use MediaWiki\Context\RequestContext;
 use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\Language\Language;
 use MediaWiki\Linker\LinkRenderer;
@@ -24,8 +25,6 @@ class CommentParserFactory {
 	/** @var RepoGroup */
 	private $repoGroup;
 	/** @var Language */
-	private $userLang;
-	/** @var Language */
 	private $contLang;
 	/** @var TitleParser */
 	private $titleParser;
@@ -39,7 +38,6 @@ class CommentParserFactory {
 	 * @param LinkBatchFactory $linkBatchFactory
 	 * @param LinkCache $linkCache
 	 * @param RepoGroup $repoGroup
-	 * @param Language $userLang
 	 * @param Language $contLang
 	 * @param TitleParser $titleParser
 	 * @param NamespaceInfo $namespaceInfo
@@ -50,7 +48,6 @@ class CommentParserFactory {
 		LinkBatchFactory $linkBatchFactory,
 		LinkCache $linkCache,
 		RepoGroup $repoGroup,
-		Language $userLang,
 		Language $contLang,
 		TitleParser $titleParser,
 		NamespaceInfo $namespaceInfo,
@@ -60,7 +57,6 @@ class CommentParserFactory {
 		$this->linkBatchFactory = $linkBatchFactory;
 		$this->linkCache = $linkCache;
 		$this->repoGroup = $repoGroup;
-		$this->userLang = $userLang;
 		$this->contLang = $contLang;
 		$this->titleParser = $titleParser;
 		$this->namespaceInfo = $namespaceInfo;
@@ -76,7 +72,7 @@ class CommentParserFactory {
 			$this->linkBatchFactory,
 			$this->linkCache,
 			$this->repoGroup,
-			$this->userLang,
+			RequestContext::getMain()->getLanguage(),
 			$this->contLang,
 			$this->titleParser,
 			$this->namespaceInfo,

includes/Defines.php

@@ -34,7 +34,7 @@ use Wikimedia\Rdbms\IDatabase;
  *
  * @since 1.35 (also backported to 1.33.3 and 1.34.1)
  */
-define( 'MW_VERSION', '1.43.0' );
+define( 'MW_VERSION', '1.43.5' );
 
 /** @{
  * Obsolete IDatabase::makeList() constants

includes/ExternalLinks/LinkFilter.php

@@ -271,11 +271,11 @@ class LinkFilter {
 			$mailparts = explode( '@', $bits['path'], 2 );
 			if ( count( $mailparts ) === 2 ) {
 				$domainpart = rtrim( self::reverseDomain( $mailparts[0] ), '.' );
+				$bits['host'] = $mailparts[1] . '@' . $domainpart;
 			} else {
 				// No @, assume it's a local part with no domain
-				$domainpart = '';
+				$bits['host'] = $mailparts[0];
 			}
-			$bits['host'] = $mailparts[1] . '@' . $domainpart;
 		} else {
 			$bits['host'] = rtrim( self::reverseDomain( $bits['host'] ), '.' );
 		}

includes/Feed/AtomFeed.php

@@ -100,7 +100,7 @@ class AtomFeed extends ChannelFeed {
 			"url" => $this->xmlEncode(
 				$this->urlUtils->expand( $item->getUrlUnescaped(), PROTO_CURRENT ) ?? ''
 			),
-			"date" => $this->xmlEncode( $this->formatTime( $item->getDate() ) ),
+			"date" => $this->xmlEncodeNullable( $this->formatTime( $item->getDate() ) ),
 			"description" => $item->getDescription(),
 			"author" => $item->getAuthor()
 		];

includes/Feed/FeedItem.php

@@ -100,6 +100,15 @@ class FeedItem {
 		return htmlspecialchars( $string );
 	}
 
+	/**
+	 * Encode $string so that it can be safely embedded in a XML document,
+	 * returning `null` if $string was `null`.
+	 * @since 1.44 (also backported to 1.39.12, 1.42.6 and 1.43.1)
+	 */
+	public function xmlEncodeNullable( ?string $string ): ?string {
+		return $string !== null ? $this->xmlEncode( $string ) : null;
+	}
+
 	/**
 	 * Get the unique id of this item; already xml-encoded
 	 *

includes/Feed/FeedUtils.php

@@ -251,7 +251,7 @@ class FeedUtils {
 				$diffText = Html::rawElement(
 					'p',
 					[],
-					Html::rawElement( 'b', [], wfMessage( 'newpage' )->text() )
+					Html::element( 'b', [], wfMessage( 'newpage' )->text() )
 				);
 				$diffText .= Html::rawElement( 'div', [], $html );
 			}

includes/Feed/RSSFeed.php

@@ -78,7 +78,7 @@ class RSSFeed extends ChannelFeed {
 			"permalink" => $item->rssIsPermalink,
 			"uniqueID" => $item->getUniqueID(),
 			"description" => $item->getDescription(),
-			"date" => $this->xmlEncode( $this->formatTime( $item->getDate() ) ),
+			"date" => $this->xmlEncodeNullable( $this->formatTime( $item->getDate() ) ),
 			"author" => $item->getAuthor()
 		];
 		$comments = $item->getCommentsUnescaped();

includes/Html/Html.php

@@ -28,6 +28,7 @@ namespace MediaWiki\Html;
 use MediaWiki\Json\FormatJson;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Parser\Sanitizer;
 use MediaWiki\Request\ContentSecurityPolicy;
 use UnexpectedValueException;
 
@@ -193,6 +194,7 @@ class Html {
 		if ( isset( self::$voidElements[$element] ) ) {
 			return $start;
 		} else {
+			$contents = Sanitizer::escapeCombiningChar( $contents ?? '' );
 			return $start . $contents . self::closeElement( $element );
 		}
 	}
@@ -847,7 +849,7 @@ class Html {
 	public static function textarea( $name, $value = '', array $attribs = [] ) {
 		$attribs['name'] = $name;
 
-		if ( substr( $value, 0, 1 ) == "\n" ) {
+		if ( substr( $value ?? '', 0, 1 ) == "\n" ) {
 			// Workaround for T14130: browsers eat the initial newline
 			// assuming that it's just for show, but they do keep the later
 			// newlines, which we may want to preserve during editing.

includes/Html/HtmlHelper.php

@@ -23,7 +23,8 @@ class HtmlHelper {
 	 *   RemexHtml\Serializer\SerializerNode argument, and returns true if it should be modified.
 	 * @param callable $modifyCallback A callback which takes a single
 	 *   RemexHtml\Serializer\SerializerNode argument and actually performs the modification on it.
-	 *   It must return the new node (which can be the original node object).
+	 *   It must return the new node (which can be the original node object)
+	 *   or a string, which is treated as the outerHTML of a replacement.
 	 * @param bool $html5format Defaults to true, which uses standard HTML5
 	 *   serialization for the parsed HTML.  If set to false, uses a
 	 *   serialization which is more compatible with the output of the

includes/Html/HtmlHelperTrait.php

@@ -3,6 +3,7 @@
 namespace MediaWiki\Html;
 
 use Wikimedia\Assert\Assert;
+use Wikimedia\RemexHtml\Serializer\HtmlFormatter;
 use Wikimedia\RemexHtml\Serializer\SerializerNode;
 
 /**
@@ -23,6 +24,9 @@ trait HtmlHelperTrait {
 		parent::__construct( $options );
 		$this->shouldModifyCallback = $shouldModifyCallback;
 		$this->modifyCallback = $modifyCallback;
+		// Escape U+0338 (T387130)
+		'@phan-var HtmlFormatter $this';
+		$this->textEscapes["\u{0338}"] = '̸';
 	}
 
 	public function element( SerializerNode $parent, SerializerNode $node, $contents ) {
@@ -30,7 +34,11 @@ trait HtmlHelperTrait {
 			$node = clone $node;
 			$node->attrs = clone $node->attrs;
 			$newNode = ( $this->modifyCallback )( $node );
-			Assert::parameterType( SerializerNode::class, $newNode, 'return value' );
+			Assert::parameterType( [ SerializerNode::class, 'string' ], $newNode, 'return value' );
+			if ( is_string( $newNode ) ) {
+				// Replace this element with an "outerHTML" string.
+				return $newNode;
+			}
 			return parent::element( $parent, $newNode, $contents );
 		} else {
 			return parent::element( $parent, $node, $contents );

includes/MainConfigNames.php

@@ -4241,12 +4241,6 @@ class MainConfigNames {
 	 */
 	public const RestAPIAdditionalRouteFiles = 'RestAPIAdditionalRouteFiles';
 
-	/**
-	 * Name constant for the RestSandboxSpecs setting, for use with Config::get()
-	 * @see MainConfigSchema::RestSandboxSpecs
-	 */
-	public const RestSandboxSpecs = 'RestSandboxSpecs';
-
 	/**
 	 * Name constant for the MaxShellMemory setting, for use with Config::get()
 	 * @see MainConfigSchema::MaxShellMemory

includes/MainConfigSchema.php

@@ -40,6 +40,7 @@ use MediaWiki\Auth\ResetPasswordSecondaryAuthenticationProvider;
 use MediaWiki\Auth\TemporaryPasswordAuthenticationRequest;
 use MediaWiki\Auth\TemporaryPasswordPrimaryAuthenticationProvider;
 use MediaWiki\Auth\ThrottlePreAuthenticationProvider;
+use MediaWiki\Config\ConfigException;
 use MediaWiki\Content\CssContentHandler;
 use MediaWiki\Content\FallbackContentHandler;
 use MediaWiki\Content\JavaScriptContentHandler;
@@ -5104,7 +5105,19 @@ class MainConfigSchema {
 		//       in them, erroneously generated by the installer.
 		$localtimezone = $localtimezone ?: self::getDefaultLocaltimezone();
 
-		$offset = ( new DateTimeZone( $localtimezone ) )->getOffset( new DateTime() );
+		try {
+			$timezone = new DateTimeZone( $localtimezone );
+		} catch ( \Exception $e ) {
+			throw new ConfigException(
+				sprintf( "Invalid timezone '%s'. Please set a valid timezone in '$%s' in LocalSettings.php. Refer to the list of valid timezones at https://www.php.net/timezones. Error: %s",
+					$localtimezone,
+					"wgLocaltimezone",
+					$e->getMessage() ),
+			);
+		}
+
+		$offset = $timezone->getOffset( new DateTime() );
+
 		return (int)( $offset / 60 );
 	}
 
@@ -7197,7 +7210,7 @@ class MainConfigSchema {
 	 * @since 1.27
 	 */
 	public const ReauthenticateTime = [
-		'default' => [ 'default' => 300, ],
+		'default' => [ 'default' => 3600, ],
 		'type' => 'map',
 		'additionalProperties' => [ 'type' => 'integer', ],
 	];
@@ -12373,36 +12386,6 @@ class MainConfigSchema {
 		'type' => 'list',
 	];
 
-	/**
-	 * A list of OpenAPI specs to be made available for exploration on
-	 * Special:RestSandbox. If none are given, Special:RestSandbox is disabled.
-	 *
-	 * This is an associative array, arbitrary spec IDs to spec descriptions.
-	 * Each spec description is an array with the following keys:
-	 * - url: the URL that will return the OpenAPI spec.
-	 * - name: the name of the API, to be shown on Special:RestSandbox.
-	 *   Ignored if msg is given.
-	 * - msg: a message key for the name of the API, to be shown on
-	 *   Special:RestSandbox.
-	 *
-	 * @unstable Introduced in 1.43. We may want to rename or change this to
-	 * accommodate the need to list external APIs in a central discovery
-	 * document.
-	 */
-	public const RestSandboxSpecs = [
-		'default' => [],
-		'type' => 'map',
-		'additionalProperties' => [
-			'type' => 'object',
-			'properties' => [
-				'url' => [ 'type' => 'string', 'format' => 'url' ],
-				'name' => [ 'type' => 'string' ],
-				'msg' => [ 'type' => 'string', 'description' => 'a message key' ]
-			],
-			'required' => [ 'url' ]
-		]
-	];
-
 	// endregion -- End AJAX and API
 
 	/***************************************************************************/
@@ -12821,7 +12804,7 @@ class MainConfigSchema {
 	 * For the pingback privacy policy, see:
 	 * https://wikimediafoundation.org/wiki/MediaWiki_Pingback_Privacy_Statement
 	 *
-	 * Aggregate pingback data is available at: https://pingback.wmflabs.org/
+	 * Aggregate pingback data is available at: https://pingback.wmcloud.org/
 	 *
 	 * @since 1.28
 	 */

includes/MediaWikiServices.php

@@ -62,6 +62,7 @@ use MediaWiki\Config\Config;
 use MediaWiki\Config\ConfigFactory;
 use MediaWiki\Config\ConfigRepository;
 use MediaWiki\Config\GlobalVarConfig;
+use MediaWiki\Content\ContentJsonCodec;
 use MediaWiki\Content\IContentHandlerFactory;
 use MediaWiki\Content\Renderer\ContentRenderer;
 use MediaWiki\Content\Transform\ContentTransformer;
@@ -966,6 +967,13 @@ class MediaWikiServices extends ServiceContainer {
 		return $this->getService( 'ContentHandlerFactory' );
 	}
 
+	/**
+	 * @since 1.45
+	 */
+	public function getContentJsonCodec(): ContentJsonCodec {
+		return $this->getService( 'ContentJsonCodec' );
+	}
+
 	/**
 	 * @since 1.32
 	 */

includes/Message/Message.php

@@ -34,6 +34,7 @@ use MediaWiki\Page\PageReference;
 use MediaWiki\Page\PageReferenceValue;
 use MediaWiki\Parser\Parser;
 use MediaWiki\Parser\ParserOutput;
+use MediaWiki\Parser\Sanitizer;
 use MediaWiki\StubObject\StubUserLang;
 use MediaWiki\Title\Title;
 use RuntimeException;
@@ -1042,7 +1043,7 @@ class Message implements Stringable, MessageSpecifier, Serializable {
 			// '⧼' is used instead of '<' to side-step any
 			// double-escaping issues.
 			// (Keep synchronised with mw.Message#toString in JS.)
-			return '⧼' . htmlspecialchars( $this->key ) . '⧽';
+			return '⧼' . Sanitizer::escapeCombiningChar( htmlspecialchars( $this->key ) ) . '⧽';
 		}
 
 		if ( in_array( $this->getLanguage()->getCode(), [ 'qqx', 'x-xss' ] ) ) {
@@ -1078,6 +1079,7 @@ class Message implements Stringable, MessageSpecifier, Serializable {
 		} elseif ( $format === self::FORMAT_ESCAPED ) {
 			$string = $this->transformText( $string );
 			$string = htmlspecialchars( $string, ENT_QUOTES, 'UTF-8', false );
+			$string = Sanitizer::escapeCombiningChar( $string );
 		}
 
 		# Raw parameter replacement
@@ -1591,7 +1593,7 @@ class Message implements Stringable, MessageSpecifier, Serializable {
 			case self::FORMAT_BLOCK_PARSE:
 			case self::FORMAT_ESCAPED:
 			default:
-				return htmlspecialchars( $plaintext, ENT_QUOTES );
+				return Sanitizer::escapeCombiningChar( htmlspecialchars( $plaintext, ENT_QUOTES ) );
 		}
 	}
 

includes/OutputTransform/DefaultOutputPipelineFactory.php

@@ -14,6 +14,7 @@ use MediaWiki\OutputTransform\Stages\ExtractBody;
 use MediaWiki\OutputTransform\Stages\HandleParsoidSectionLinks;
 use MediaWiki\OutputTransform\Stages\HandleSectionLinks;
 use MediaWiki\OutputTransform\Stages\HandleTOCMarkers;
+use MediaWiki\OutputTransform\Stages\HardenNFC;
 use MediaWiki\OutputTransform\Stages\HydrateHeaderPlaceholders;
 use MediaWiki\OutputTransform\Stages\ParsoidLocalization;
 use MediaWiki\OutputTransform\Stages\RenderDebugInfo;
@@ -98,6 +99,10 @@ class DefaultOutputPipelineFactory {
 		'HydrateHeaderPlaceholders' => [
 			'class' => HydrateHeaderPlaceholders::class,
 		],
+		# This should be last, in order to ensure final output is hardened
+		'HardenNFC' => [
+			'class' => HardenNFC::class,
+		],
 	];
 
 	public function __construct(

includes/OutputTransform/Stages/DeduplicateStyles.php

@@ -2,11 +2,12 @@
 
 namespace MediaWiki\OutputTransform\Stages;
 
-use MediaWiki\Html\Html;
+use MediaWiki\Html\HtmlHelper;
 use MediaWiki\OutputTransform\ContentTextTransformStage;
 use MediaWiki\Parser\ParserOptions;
 use MediaWiki\Parser\ParserOutput;
-use MediaWiki\Parser\Sanitizer;
+use Wikimedia\RemexHtml\Serializer\SerializerNode;
+use Wikimedia\RemexHtml\Tokenizer\PlainAttributes;
 
 /**
  * Generates a list of unique style links
@@ -20,28 +21,51 @@ class DeduplicateStyles extends ContentTextTransformStage {
 
 	protected function transformText( string $text, ParserOutput $po, ?ParserOptions $popts, array &$options ): string {
 		$seen = [];
-		return preg_replace_callback( '#<style\s+([^>]*data-mw-deduplicate\s*=[\'"][^>]*)>.*?</style>#s',
-			static function ( $m ) use ( &$seen ) {
-				$attr = Sanitizer::decodeTagAttributes( $m[1] );
-				if ( !isset( $attr['data-mw-deduplicate'] ) ) {
-					return $m[0];
-				}
+		$isParsoidContent = $options['isParsoidContent'] ?? false;
 
-				$key = $attr['data-mw-deduplicate'];
-				if ( !isset( $seen[$key] ) ) {
-					$seen[$key] = true;
+		$transform = static function ( $fragment ) use ( &$seen, $isParsoidContent ) {
+			return HtmlHelper::modifyElements(
+				$fragment,
+				static function ( SerializerNode $node ): bool {
+					return $node->name === 'style' &&
+						( $node->attrs['data-mw-deduplicate'] ?? '' ) !== '';
+				},
+				static function ( SerializerNode $node ) use ( &$seen ): SerializerNode {
+					$key = $node->attrs['data-mw-deduplicate'];
+					if ( !isset( $seen[$key] ) ) {
+						$seen[$key] = true;
+						return $node;
+					}
+					// We were going to use an empty <style> here, but there
+					// was concern that would be too much overhead for browsers.
+					// So let's hope a <link> with a non-standard rel and href isn't
+					// going to be misinterpreted or mangled by any subsequent processing.
+					$node->name = 'link';
+					$node->attrs = new PlainAttributes( [
+						'rel' => 'mw-deduplicated-inline-style',
+						'href' => "mw-data:" . wfUrlencode( $key ),
+					] );
+					$node->children = [];
+					$node->void = true;
+					return $node;
+				},
+				$isParsoidContent
+			);
+		};
 
-					return $m[0];
-				}
+		if ( !$isParsoidContent ) {
+			// Optimization: Only transform possible style nodes to avoid having to tokenize the entire output,
+			// which is expensive for large pages (T394059).
+			// This is unsafe to do for Parsoid content, since the naïve regex below might match encoded style
+			// tags within data-parsoid attribute values, so only apply it to legacy parser output.
+			// Parsoid content transformations will be further optimized in T394005.
+			return preg_replace_callback(
+				'#<style\s+([^>]*data-mw-deduplicate\s*=[\'"][^>]*)>.*?</style>#s',
+				static fn ( array $matches ) => $transform( $matches[0] ),
+				$text
+			);
+		}
 
-				// We were going to use an empty <style> here, but there
-				// was concern that would be too much overhead for browsers.
-				// So let's hope a <link> with a non-standard rel and href isn't
-				// going to be misinterpreted or mangled by any subsequent processing.
-				return Html::element( 'link', [
-					'rel' => 'mw-deduplicated-inline-style',
-					'href' => "mw-data:" . wfUrlencode( $key ),
-				] );
-			}, $text );
+		return $transform( $text );
 	}
 }

includes/OutputTransform/Stages/HandleSectionLinks.php

@@ -155,6 +155,10 @@ class HandleSectionLinks extends ContentTextTransformStage {
 		$link, $fallbackAnchor, string $wrapperType
 	) {
 		$anchorEscaped = htmlspecialchars( $anchor, ENT_COMPAT );
+		$idAttr = " id=\"$anchorEscaped\"";
+		if ( isset( $attrs['id'] ) ) {
+			$idAttr = '';
+		}
 		$fallback = '';
 		if ( $fallbackAnchor !== false && $fallbackAnchor !== $anchor ) {
 			$fallbackAnchor = htmlspecialchars( $fallbackAnchor, ENT_COMPAT );
@@ -164,16 +168,16 @@ class HandleSectionLinks extends ContentTextTransformStage {
 		switch ( $wrapperType ) {
 			case 'legacy':
 				return "<h$level" . Html::expandAttributes( $attrs ) . ">"
-					. "$fallback<span class=\"mw-headline\" id=\"$anchorEscaped\">$html</span>"
+					. "$fallback<span class=\"mw-headline\"$idAttr>$html</span>"
 					. $link
 					. "</h$level>";
 			case 'mwheading':
 				return "<div class=\"mw-heading mw-heading$level\">"
-					. "<h$level id=\"$anchorEscaped\"" . Html::expandAttributes( $attrs ) . ">$fallback$html</h$level>"
+					. "<h$level$idAttr" . Html::expandAttributes( $attrs ) . ">$fallback$html</h$level>"
 					. $link
 					. "</div>";
 			case 'none':
-				return "<h$level id=\"$anchorEscaped\"" . Html::expandAttributes( $attrs ) . ">$fallback$html</h$level>"
+				return "<h$level$idAttr" . Html::expandAttributes( $attrs ) . ">$fallback$html</h$level>"
 					. $link;
 			default:
 				throw new LogicException( "Bad wrapper type: $wrapperType" );

includes/OutputTransform/Stages/HardenNFC.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace MediaWiki\OutputTransform\Stages;
+
+use MediaWiki\OutputTransform\ContentTextTransformStage;
+use MediaWiki\Parser\ParserOptions;
+use MediaWiki\Parser\ParserOutput;
+use MediaWiki\Parser\Sanitizer;
+
+/**
+ * Hardens the output against NFC normalization (T387130).
+ * @internal
+ */
+class HardenNFC extends ContentTextTransformStage {
+
+	public function shouldRun( ParserOutput $po, ?ParserOptions $popts, array $options = [] ): bool {
+		return true;
+	}
+
+	protected function transformText( string $text, ParserOutput $po, ?ParserOptions $popts, array &$options ): string {
+		return Sanitizer::escapeCombiningChar( $text );
+	}
+}

includes/PHPVersionCheck.php

@@ -20,6 +20,7 @@
 
 // phpcs:disable Generic.Arrays.DisallowLongArraySyntax,PSR2.Classes.PropertyDeclaration,MediaWiki.Usage.DirUsage
 // phpcs:disable Squiz.Scope.MemberVarScope.Missing,Squiz.Scope.MethodScope.Missing
+// phpcs:disable MediaWiki.Usage.StaticClosure.StaticClosure
 /**
  * Check PHP Version, as well as for composer dependencies in entry points,
  * and display something vaguely comprehensible in the event of a totally
@@ -78,6 +79,8 @@ class PHPVersionCheck {
 	 * Displays an error, if the installed PHP version does not meet the minimum requirement.
 	 */
 	function checkRequiredPHPVersion() {
+		// This value should match the PHP version specified in composer.json,
+		// .phan/config.php, and ScopeStructureTest.php
 		$minimumVersion = '8.1.0';
 
 		/**
@@ -186,18 +189,29 @@ HTML;
 		$missingExtensions = array();
 		foreach ( $this->functionsExtensionsMapping as $function => $extension ) {
 			if ( !function_exists( $function ) ) {
-				$missingExtensions[] = $extension;
+				$missingExtensions[] = array( $extension );
 			}
 		}
 
+		// Special case: either of those is required, but only on 32-bit systems (T391169)
+		if ( PHP_INT_SIZE < 8 && !extension_loaded( 'gmp' ) && !extension_loaded( 'bcmath' ) ) {
+			$missingExtensions[] = array( 'bcmath', 'gmp' );
+		}
+
 		if ( $missingExtensions ) {
 			$missingExtText = '';
 			$missingExtHtml = '';
 			$baseUrl = 'https://www.php.net';
-			foreach ( $missingExtensions as $ext ) {
-				$missingExtText .= " * $ext <$baseUrl/$ext>\n";
-				$missingExtHtml .= "<li><b>$ext</b> "
-					. "(<a href=\"$baseUrl/$ext\">more information</a>)</li>";
+			foreach ( $missingExtensions as $extNames ) {
+				$plaintextLinks = array();
+				$htmlLinks = array();
+				foreach ( $extNames as $ext ) {
+					$plaintextLinks[] = "$ext <$baseUrl/$ext>";
+					$htmlLinks[] = "<b>$ext</b> (<a href=\"$baseUrl/$ext\">more information</a>)";
+				}
+
+				$missingExtText .= ' * ' . implode( ' or ', $plaintextLinks ) . "\n";
+				$missingExtHtml .= "<li>" . implode( ' or ', $htmlLinks ) . "</li>";
 			}
 
 			$cliText = "Error: Missing one or more required PHP extensions. Please see\n"

includes/Permissions/PermissionManager.php

@@ -699,6 +699,7 @@ class PermissionManager {
 		// We avoid expensive display logic for quickUserCan's and such
 		if ( $short ) {
 			$status->fatal( 'badaccess-group0' );
+			return;
 		}
 
 		// TODO: it would be a good idea to replace the method below with something else like
@@ -1130,14 +1131,32 @@ class PermissionManager {
 	): void {
 		// TODO: remove & rework upon further use of LinkTarget
 		$title = Title::newFromLinkTarget( $page );
+
 		if ( $rigor !== self::RIGOR_QUICK && !$title->isUserConfigPage() ) {
-			[ $cascadingSources, $restrictions ] = $this->restrictionStore->getCascadeProtectionSources( $title );
+			[ $sources, $restrictions, $tlSources, $ilSources ] = $this->restrictionStore
+				->getCascadeProtectionSources( $title );
+
+			// If the file Wikitext isn't transcluded then we
+			// don't care about edit cascade restrictions for edit action
+			if ( $action === 'edit' && $page->getNamespace() === NS_FILE && !$tlSources ) {
+				return;
+			}
+
+			// For the purposes of cascading protection, edit restrictions should apply to uploads or moves
+			// Thus remap upload and move to edit
+			// Unless the file content itself is not transcluded
+			if ( $ilSources && ( $action === 'upload' || $action === 'move' ) ) {
+				$restrictedAction = 'edit';
+			} else {
+				$restrictedAction = $action;
+			}
+
 			// Cascading protection depends on more than this page...
 			// Several cascading protected pages may include this page...
 			// Check each cascading level
 			// This is only for protection restrictions, not for all actions
-			if ( isset( $restrictions[$action] ) ) {
-				foreach ( $restrictions[$action] as $right ) {
+			if ( isset( $restrictions[$restrictedAction] ) ) {
+				foreach ( $restrictions[$restrictedAction] as $right ) {
 					// Backwards compatibility, rewrite sysop -> editprotected
 					if ( $right === 'sysop' ) {
 						$right = 'editprotected';
@@ -1148,10 +1167,10 @@ class PermissionManager {
 					}
 					if ( $right != '' && !$this->userHasAllRights( $user, 'protect', $right ) ) {
 						$wikiPages = '';
-						foreach ( $cascadingSources as $pageIdentity ) {
+						foreach ( $sources as $pageIdentity ) {
 							$wikiPages .= '* [[:' . $this->titleFormatter->getPrefixedText( $pageIdentity ) . "]]\n";
 						}
-						$status->fatal( 'cascadeprotected', count( $cascadingSources ), $wikiPages, $action );
+						$status->fatal( 'cascadeprotected', count( $sources ), $wikiPages, $action );
 					}
 				}
 			}
@@ -1563,6 +1582,11 @@ class PermissionManager {
 				$userObj->isRegistered()
 				&& $this->options->get( MainConfigNames::BlockDisablesLogin )
 			) {
+				// Stash the permissions as they are before triggering any block checks for BlockDisablesLogin
+				// to avoid a potential infinite loop, since GetUserBlock handlers may themselves check
+				// permissions on this user. (T384197)
+				$this->usersRights[ $rightsCacheKey ] = $rights;
+
 				$isExempt = in_array( 'ipblock-exempt', $rights, true );
 				if ( $this->blockManager->getBlock(
 					$userObj,

includes/Permissions/RateLimiter.php

@@ -210,7 +210,8 @@ class RateLimiter {
 
 		$conds = $this->getConditions( $action );
 		$limiter = $this->wrstatsFactory->createRateLimiter( $conds, [ 'limiter', $action ] );
-		$limitBatch = $limiter->createBatch( $incrBy );
+		$peekMode = $incrBy === 0;
+		$limitBatch = $limiter->createBatch( $incrBy ?: 1 );
 		$this->logger->debug( __METHOD__ . ": limiting $action rate for {$user->getName()}" );
 
 		$id = $user->getId();
@@ -311,7 +312,7 @@ class RateLimiter {
 			'ip' => $ip,
 		];
 
-		$batchResult = $limitBatch->tryIncr();
+		$batchResult = $peekMode ? $limitBatch->peek() : $limitBatch->tryIncr();
 		foreach ( $batchResult->getFailedResults() as $type => $result ) {
 			$this->logger->info(
 				'User::pingLimiter: User tripped rate limit',

includes/Permissions/RestrictionStore.php

@@ -54,7 +54,6 @@ class RestrictionStore {
 	 *   ?array `create_protection` => value for getCreateProtection
 	 *   bool `cascade` => cascade restrictions on this page to included templates and images?
 	 *   array[] `cascade_sources` => the results of getCascadeProtectionSources
-	 *   bool `has_cascading` => Are cascading restrictions in effect on this page?
 	 * ]
 	 */
 	private $cache = [];
@@ -266,7 +265,7 @@ class RestrictionStore {
 	public function isCascadeProtected( PageIdentity $page ): bool {
 		$page->assertWiki( PageIdentity::LOCAL );
 
-		return $this->getCascadeProtectionSourcesInternal( $page, true );
+		return $this->getCascadeProtectionSourcesInternal( $page )[0] !== [];
 	}
 
 	/**
@@ -520,81 +519,96 @@ class RestrictionStore {
 	 * Cascading protection: Get the source of any cascading restrictions on this page.
 	 *
 	 * @param PageIdentity $page Must be local
-	 * @return array[] Two elements: First is an array of PageIdentity objects of the pages from
-	 *   which cascading restrictions have come, which may be empty. Second is an array like that
-	 *   returned by getAllRestrictions().
+	 * @return array[] Four elements: First is an array of PageIdentity objects combining the
+	 *   third and fourth elements of this array, which may be empty.
+	 *   Second is an array like that returned by getAllRestrictions().
+	 *   Third is an array of PageIdentity objects of the pages from
+	 *   which cascading restrictions have come, orginating via templatelinks, which may be empty.
+	 *   Fourth is an array of PageIdentity objects of the pages from
+	 *   which cascading restrictions have come, orginating via imagelinks, which may be empty.
 	 */
 	public function getCascadeProtectionSources( PageIdentity $page ): array {
 		$page->assertWiki( PageIdentity::LOCAL );
 
-		return $this->getCascadeProtectionSourcesInternal( $page, false );
+		return $this->getCascadeProtectionSourcesInternal( $page );
 	}
 
 	/**
 	 * Cascading protection: Get the source of any cascading restrictions on this page.
 	 *
 	 * @param PageIdentity $page Must be local
-	 * @param bool $shortCircuit If true, just return true or false instead of the actual lists.
-	 * @return array|bool If $shortCircuit is true, return true if there is some cascading
-	 *   protection and false otherwise. Otherwise, same as getCascadeProtectionSources().
+	 * @return array[] Same as getCascadeProtectionSources().
 	 */
 	private function getCascadeProtectionSourcesInternal(
-		PageIdentity $page, bool $shortCircuit = false
-	) {
+		PageIdentity $page
+	): array {
 		if ( !$page->canExist() ) {
-			return $shortCircuit ? false : [ [], [] ];
+			return [ [], [], [], [] ];
 		}
 
 		$cacheEntry = &$this->cache[CacheKeyHelper::getKeyForPage( $page )];
 
-		if ( !$shortCircuit && isset( $cacheEntry['cascade_sources'] ) ) {
+		if ( isset( $cacheEntry['cascade_sources'] ) ) {
 			return $cacheEntry['cascade_sources'];
-		} elseif ( $shortCircuit && isset( $cacheEntry['has_cascading'] ) ) {
-			return $cacheEntry['has_cascading'];
 		}
 
 		$dbr = $this->loadBalancer->getConnection( DB_REPLICA );
-		$queryBuilder = $dbr->newSelectQueryBuilder();
-		$queryBuilder->select( [ 'pr_expiry' ] )
+
+		$baseQuery = $dbr->newSelectQueryBuilder()
+			->select( [
+				'pr_expiry',
+				'pr_page',
+				'page_namespace',
+				'page_title',
+				'pr_type',
+				'pr_level'
+			] )
 			->from( 'page_restrictions' )
+			->join( 'page', null, 'page_id=pr_page' )
 			->where( [ 'pr_cascade' => 1 ] );
 
-		if ( $page->getNamespace() === NS_FILE ) {
-			// Files transclusion may receive cascading protection in the future
-			// see https://phabricator.wikimedia.org/T241453
-			$queryBuilder->join( 'imagelinks', null, 'il_from=pr_page' );
-			$queryBuilder->andWhere( [ 'il_to' => $page->getDBkey() ] );
-		} else {
-			$queryBuilder->join( 'templatelinks', null, 'tl_from=pr_page' );
-			$queryBuilder->andWhere(
-				$this->linksMigration->getLinksConditions(
-					'templatelinks',
-					TitleValue::newFromPage( $page )
-				)
+		$imageQuery = clone $baseQuery;
+		$imageQuery->join( 'imagelinks', null, 'il_from=pr_page' )
+			->fields( [
+				'type' => $dbr->addQuotes( 'il' ),
+			] )
+			->andWhere( [ 'il_to' => $page->getDBkey() ] );
+
+		$templateQuery = clone $baseQuery;
+		$templateQuery->join( 'templatelinks', null, 'tl_from=pr_page' )
+			->fields( [
+				'type' => $dbr->addQuotes( 'tl' ),
+			] )
+			->andWhere(
+				$this->linksMigration->getLinksConditions( 'templatelinks', TitleValue::newFromPage( $page ) )
 			);
+
+		if ( $page->getNamespace() === NS_FILE ) {
+			$unionQuery = $dbr->newUnionQueryBuilder()
+				->add( $imageQuery )
+				->add( $templateQuery )
+				->all();
+
+			$res = $unionQuery->caller( __METHOD__ )->fetchResultSet();
+		} else {
+			$res = $templateQuery->caller( __METHOD__ )->fetchResultSet();
 		}
 
-		if ( !$shortCircuit ) {
-			$queryBuilder->fields( [ 'pr_page', 'page_namespace', 'page_title', 'pr_type', 'pr_level' ] );
-			$queryBuilder->join( 'page', null, 'page_id=pr_page' );
-		}
-
-		$res = $queryBuilder->caller( __METHOD__ )->fetchResultSet();
-
-		$sources = [];
+		$tlSources = [];
+		$ilSources = [];
 		$pageRestrictions = [];
 		$now = wfTimestampNow();
-
 		foreach ( $res as $row ) {
 			$expiry = $dbr->decodeExpiry( $row->pr_expiry );
 			if ( $expiry > $now ) {
-				if ( $shortCircuit ) {
-					$cacheEntry['has_cascading'] = true;
-					return true;
+				if ( $row->type === 'il' ) {
+					$ilSources[$row->pr_page] = new PageIdentityValue( $row->pr_page,
+					$row->page_namespace, $row->page_title, PageIdentity::LOCAL );
+				} elseif ( $row->type === 'tl' ) {
+					$tlSources[$row->pr_page] = new PageIdentityValue( $row->pr_page,
+					$row->page_namespace, $row->page_title, PageIdentity::LOCAL );
 				}
 
-				$sources[$row->pr_page] = new PageIdentityValue( $row->pr_page,
-						$row->page_namespace, $row->page_title, PageIdentity::LOCAL );
 				// Add groups needed for each restriction type if its not already there
 				// Make sure this restriction type still exists
 
@@ -608,14 +622,11 @@ class RestrictionStore {
 			}
 		}
 
-		$cacheEntry['has_cascading'] = (bool)$sources;
+		$sources = array_replace( $tlSources, $ilSources );
 
-		if ( $shortCircuit ) {
-			return false;
-		}
+		$cacheEntry['cascade_sources'] = [ $sources, $pageRestrictions, $tlSources, $ilSources ];
 
-		$cacheEntry['cascade_sources'] = [ $sources, $pageRestrictions ];
-		return [ $sources, $pageRestrictions ];
+		return $cacheEntry['cascade_sources'];
 	}
 
 	/**

includes/Request/HeaderCallback.php

@@ -90,12 +90,12 @@ class HeaderCallback {
 	 * @since 1.29
 	 */
 	public static function warnIfHeadersSent() {
-		if ( headers_sent() && !self::$messageSent ) {
+		if ( !self::$messageSent && headers_sent( $filename, $line ) ) {
 			self::$messageSent = true;
 			\MediaWiki\Debug\MWDebug::warning( 'Headers already sent, should send headers earlier than ' .
 				wfGetCaller( 3 ) );
 			$logger = \MediaWiki\Logger\LoggerFactory::getInstance( 'headers-sent' );
-			$logger->error( 'Warning: headers were already sent from the location below', [
+			$logger->error( 'Warning: headers were already sent (output started at ' . $filename . ':' . $line . ')', [
 				'exception' => self::$headersSentException,
 				'detection-trace' => new RuntimeException( 'Detected here' ),
 			] );

includes/ResourceLoader/ResourceLoader.php

@@ -1344,7 +1344,7 @@ MESSAGE;
 	 */
 	public static function ensureNewline( $str ) {
 		$end = substr( $str, -1 );
-		if ( $end === false || $end === '' || $end === "\n" ) {
+		if ( $end === '' || $end === "\n" ) {
 			return $str;
 		}
 		return $str . "\n";

includes/Rest/Handler/CreationHandler.php

@@ -110,4 +110,13 @@ class CreationHandler extends EditHandler {
 		$response->setHeader( 'Location', $url );
 	}
 
+	/**
+	 * This method specifies the JSON schema file for the response
+	 * body when creating a new page.
+	 *
+	 * @return ?string The file path to the NewPage JSON schema.
+	 */
+	public function getResponseBodySchemaFileName( string $method ): ?string {
+		return 'includes/Rest/Handler/Schema/NewPage.json';
+	}
 }

includes/Rest/Handler/Helper/HtmlOutputRendererHelper.php

@@ -289,18 +289,6 @@ class HtmlOutputRendererHelper implements HtmlOutputHelper {
 		}
 	}
 
-	/**
-	 * Controls how the parser cache is used.
-	 *
-	 * @param bool $read Whether we should look for cached output before parsing
-	 * @param bool $write Whether we should cache output after parsing
-	 */
-	public function setUseParserCache( bool $read, bool $write ) {
-		$this->parserOutputAccessOptions =
-			( $read ? 0 : ParserOutputAccess::OPT_FORCE_PARSE ) |
-			( $write ? 0 : ParserOutputAccess::OPT_NO_UPDATE_CACHE );
-	}
-
 	/**
 	 * Determine whether stashing should be applied.
 	 *

includes/Rest/Handler/Helper/PageContentHelper.php

@@ -299,6 +299,9 @@ class PageContentHelper {
 			$restrictions[] = 'userhidden';
 		}
 
+		$publicUser = $revision->getUser();
+		$publicComment = $revision->getComment();
+
 		return [
 			'title' => $title->getPrefixedDBkey(),
 			'page_id' => $page->getId(),
@@ -312,9 +315,9 @@ class PageContentHelper {
 
 			'namespace' => $page->getNamespace(),
 			'user_id' => $revision->getUser( RevisionRecord::RAW )->getId(),
-			'user_text' => $revision->getUser( RevisionRecord::FOR_PUBLIC )->getName(),
+			'user_text' => $publicUser ? $publicUser->getName() : null,
+			'comment' => $publicComment ? $publicComment->text : null,
 			'timestamp' => wfTimestampOrNull( TS_ISO_8601, $revision->getTimestamp() ),
-			'comment' => $revision->getComment()->text,
 			'tags' => $tags,
 			'restrictions' => $restrictions,
 			'page_language' => $title->getPageLanguage()->getCode(),

includes/Rest/Handler/LanguageLinksHandler.php

@@ -190,4 +190,7 @@ class LanguageLinksHandler extends SimpleHandler {
 		return (bool)$this->getPage();
 	}
 
+	public function getResponseBodySchemaFileName( string $method ): ?string {
+		return 'includes/Rest/Handler/Schema/PageLanguageLinks.json';
+	}
 }

includes/Rest/Handler/MediaFileHandler.php

@@ -171,4 +171,8 @@ class MediaFileHandler extends SimpleHandler {
 		$file = $this->getFile();
 		return $file && $file->exists();
 	}
+
+	public function getResponseBodySchemaFileName( string $method ): ?string {
+		return 'includes/Rest/Handler/Schema/MediaFile.json';
+	}
 }

includes/Rest/Handler/MediaLinksHandler.php

@@ -192,4 +192,8 @@ class MediaLinksHandler extends SimpleHandler {
 	protected function getMaxNumLinks(): int {
 		return self::MAX_NUM_LINKS;
 	}
+
+	public function getResponseBodySchemaFileName( string $method ): ?string {
+		return 'includes/Rest/Handler/Schema/MediaLinks.json';
+	}
 }

includes/Rest/Handler/PageHTMLHandler.php

@@ -99,6 +99,7 @@ class PageHTMLHandler extends SimpleHandler {
 		);
 
 		if ( $redirectResponse !== null ) {
+			$redirectResponse->setHeader( 'Cache-Control', 'max-age=60' );
 			return $redirectResponse;
 		}
 
@@ -181,4 +182,23 @@ class PageHTMLHandler extends SimpleHandler {
 			HtmlOutputRendererHelper::getParamSettings()
 		);
 	}
+
+	protected function generateResponseSpec( string $method ): array {
+		$spec = parent::generateResponseSpec( $method );
+
+		// TODO: Consider if we prefer something like:
+		//    text/html; charset=utf-8; profile="https://www.mediawiki.org/wiki/Specs/HTML/2.8.0"
+		//  That would be more specific, but fragile when the profile version changes. It could
+		//  also be inaccurate if the page content was not in fact produced by Parsoid.
+		if ( $this->getOutputMode() == 'html' ) {
+			unset( $spec['200']['content']['application/json'] );
+			$spec['200']['content']['text/html']['schema']['type'] = 'string';
+		}
+
+		return $spec;
+	}
+
+	public function getResponseBodySchemaFileName( string $method ): ?string {
+		return 'includes/Rest/Handler/Schema/ExistingPageHtml.json';
+	}
 }

includes/Rest/Handler/PageHistoryHandler.php

@@ -484,4 +484,8 @@ class PageHistoryHandler extends SimpleHandler {
 	protected function hasRepresentation() {
 		return (bool)$this->getPage();
 	}
+
+	public function getResponseBodySchemaFileName( string $method ): ?string {
+		return 'includes/Rest/Handler/Schema/PageHistory.json';
+	}
 }

includes/Rest/Handler/PageSourceHandler.php

@@ -166,4 +166,22 @@ class PageSourceHandler extends SimpleHandler {
 	protected function hasRepresentation() {
 		return $this->contentHelper->hasContent();
 	}
+
+	public function getResponseBodySchemaFileName( string $method ): ?string {
+		// This does not include restbase compatibility mode, which is triggered by request
+		// headers. Presumably, such callers will look at the RESTBase spec instead.
+		switch ( $this->getConfig()['format'] ) {
+			case 'bare':
+				$schema = 'includes/Rest/Handler/Schema/ExistingPageBare.json';
+				break;
+			case 'source':
+				$schema = 'includes/Rest/Handler/Schema/ExistingPageSource.json';
+				break;
+			default:
+				$schema = null;
+				break;
+		}
+
+		return $schema;
+	}
 }

includes/Rest/Handler/Schema/ExistingPageBare.json

@@ -0,0 +1,62 @@
+{
+	"description": "Page without content",
+	"required": [
+		"id",
+		"key",
+		"title",
+		"latest",
+		"content_model",
+		"license",
+		"html_url"
+	],
+	"properties": {
+		"id": {
+			"type": "integer",
+			"description": "Page identifier"
+		},
+		"key": {
+			"type": "string",
+			"description": "Page title in URL-friendly format"
+		},
+		"title": {
+			"type": "string",
+			"description": "Page title"
+		},
+		"latest": {
+			"type": "object",
+			"description": "Information about the latest revision",
+			"properties": {
+				"id": {
+					"type": "integer",
+					"description": "Revision identifier for the latest revision"
+				},
+				"timestamp": {
+					"type": "string",
+					"description": " Timestamp of the latest revision"
+				}
+			}
+		},
+		"content_model": {
+			"type": "string",
+			"description": "Page content type"
+		},
+		"license": {
+			"type": "object",
+			"description": "Information about the wiki's license",
+			"properties": {
+				"url": {
+					"type": "string",
+					"description": "URL of the applicable license"
+				},
+				"title": {
+					"type": "string",
+					"description": "Name of the applicable license"
+				}
+			}
+		},
+		"html_url": {
+			"type": "string",
+			"description": "API route to fetch the content of the page in HTML"
+		}
+	}
+}

includes/Rest/Handler/Schema/ExistingPageHtml.json

@@ -0,0 +1,62 @@
+{
+	"description": "Page with HTML content",
+	"required": [
+		"id",
+		"key",
+		"title",
+		"latest",
+		"content_model",
+		"license",
+		"html"
+	],
+	"properties": {
+		"id": {
+			"type": "integer",
+			"description": "Page identifier"
+		},
+		"key": {
+			"type": "string",
+			"description": "Page title in URL-friendly format"
+		},
+		"title": {
+			"type": "string",
+			"description": "Page title in reading-friendly format"
+		},
+		"latest": {
+			"type": "object",
+			"description": "Information about the latest revision",
+			"properties": {
+				"id": {
+					"type": "integer",
+					"description": "Revision identifier for the latest revision"
+				},
+				"timestamp": {
+					"type": "string",
+					"description": " Timestamp of the latest revision in ISO 8601 format"
+				}
+			}
+		},
+		"content_model": {
+			"type": "string",
+			"description": "Type of content on the page"
+		},
+		"license": {
+			"type": "object",
+			"description": "Information about the wiki's license",
+			"properties": {
+				"url": {
+					"type": "string",
+					"description": "URL of the applicable license based on the $wgRightsUrl setting"
+				},
+				"title": {
+					"type": "string",
+					"description": "Name of the applicable license based on the $wgRightsText setting"
+				}
+			}
+		},
+		"html": {
+			"type": "string",
+			"description": "Latest page content in HTML, following the HTML specification"
+		}
+	}
+}

includes/Rest/Handler/Schema/ExistingPageSource.json

@@ -0,0 +1,62 @@
+{
+	"description": "Page with source (usually wikitext)",
+	"required": [
+		"id",
+		"key",
+		"title",
+		"latest",
+		"content_model",
+		"license",
+		"source"
+	],
+	"properties": {
+		"id": {
+			"type": "integer",
+			"description": "Page identifier"
+		},
+		"key": {
+			"type": "string",
+			"description": "Page title in URL-friendly format"
+		},
+		"title": {
+			"type": "string",
+			"description": "Page title"
+		},
+		"latest": {
+			"type": "object",
+			"description": "Information about the latest revision",
+			"properties": {
+				"id": {
+					"type": "integer",
+					"description": "Revision identifier for the latest revision"
+				},
+				"timestamp": {
+					"type": "string",
+					"description": " Timestamp of the latest revision"
+				}
+			}
+		},
+		"content_model": {
+			"type": "string",
+			"description": "Page content type"
+		},
+		"license": {
+			"type": "object",
+			"description": "Information about the wiki's license",
+			"properties": {
+				"url": {
+					"type": "string",
+					"description": "URL of the applicable license"
+				},
+				"title": {
+					"type": "string",
+					"description": "Name of the applicable license"
+				}
+			}
+		},
+		"source": {
+			"type": "string",
+			"description": "Latest page content in the format specified by the content_model property"
+		}
+	}
+}

includes/Rest/Handler/Schema/MediaFile.json

@@ -0,0 +1,165 @@
+{
+	"description": "Information about the file",
+	"required": [
+		"title",
+		"file_description_url",
+		"latest",
+		"preferred",
+		"original",
+		"thumbnail"
+	],
+	"properties": {
+		"title": {
+			"type": "string",
+			"description": "File title"
+		},
+		"file_description_url": {
+			"type": "string",
+			"description": "URL for the page describing the file, including license information and other metadata"
+		},
+		"latest": {
+			"type": "object",
+			"nullable": true,
+			"description": "Information about the latest revision to the file",
+			"properties": {
+				"timestamp": {
+					"type": "string",
+					"format": "date-time",
+					"description": "Last modified timestamp in ISO 8601 format"
+				},
+				"user": {
+					"type": "object",
+					"description": "Information about the user who uploaded the file",
+					"properties": {
+						"id": {
+							"type": "integer",
+							"nullable": true,
+							"description": "User identifier"
+						},
+						"name": {
+							"type": "string",
+							"nullable": true,
+							"description": "Username"
+						}
+					},
+					"required": [ "id", "name" ]
+				}
+			},
+			"required": [ "timestamp", "user" ]
+		},
+		"preferred": {
+			"type": "object",
+			"nullable": true,
+			"description": "Information about the file's preferred preview format, original format, and thumbnail format",
+			"properties": {
+				"mediatype": {
+					"type": "string",
+					"enum": [ "BITMAP", "DRAWING", "AUDIO", "VIDEO", "MULTIMEDIA", "UNKNOWN", "OFFICE", "TEXT", "EXECUTABLE", "ARCHIVE", "3D" ],
+					"description": "The file type"
+				},
+				"size": {
+					"type": "integer",
+					"nullable": true,
+					"description": "File size in bytes or null if not available"
+				},
+				"width": {
+					"type": "integer",
+					"nullable": true,
+					"description": "Maximum recommended image width in pixels or null if not available"
+				},
+				"height": {
+					"type": "integer",
+					"nullable": true,
+					"description": "Maximum recommended image height in pixels or null if not available"
+				},
+				"duration": {
+					"type": "number",
+					"nullable": true,
+					"description": "The length of the video, audio, or multimedia file or null for other media types"
+				},
+				"url": {
+					"type": "string",
+					"format": "uri",
+					"description": "URL to download the file"
+				}
+			},
+			"required": [ "mediatype", "size", "width", "height", "duration", "url" ]
+		},
+		"original": {
+			"type": "object",
+			"nullable": true,
+			"description": "Original file details",
+			"properties": {
+				"mediatype": {
+					"type": "string",
+					"enum": [ "BITMAP", "DRAWING", "AUDIO", "VIDEO", "MULTIMEDIA", "UNKNOWN", "OFFICE", "TEXT", "EXECUTABLE", "ARCHIVE", "3D" ],
+					"description": "The file type"
+				},
+				"size": {
+					"type": "integer",
+					"nullable": true,
+					"description": "File size in bytes or null if not available"
+				},
+				"width": {
+					"type": "integer",
+					"nullable": true,
+					"description": "Maximum recommended image width in pixels or null if not available"
+				},
+				"height": {
+					"type": "integer",
+					"nullable": true,
+					"description": "Maximum recommended image height in pixels or null if not available"
+				},
+				"duration": {
+					"type": "number",
+					"nullable": true,
+					"description": "The length of the video, audio, or multimedia file or null for other media types"
+				},
+				"url": {
+					"type": "string",
+					"format": "url",
+					"description": "URL to download the file"
+				}
+			},
+			"required": [ "mediatype", "size", "width", "height", "duration", "url" ]
+		},
+		"thumbnail": {
+			"type": "object",
+			"nullable": true,
+			"description": "Thumbnail information",
+			"properties": {
+				"mediatype": {
+					"type": "string",
+					"enum": [ "BITMAP", "DRAWING", "AUDIO", "VIDEO", "MULTIMEDIA", "UNKNOWN", "OFFICE", "TEXT", "EXECUTABLE", "ARCHIVE", "3D" ],
+					"description": "The file type"
+				},
+				"size": {
+					"type": "integer",
+					"nullable": true,
+					"description": "File size in bytes or null if not available"
+				},
+				"width": {
+					"type": "integer",
+					"nullable": true,
+					"description": "Maximum recommended image width in pixels or null if not available"
+				},
+				"height": {
+					"type": "integer",
+					"nullable": true,
+					"description": "Maximum recommended image height in pixels or null if not available"
+				},
+				"duration": {
+					"type": "number",
+					"nullable": true,
+					"description": "The length of the video, audio, or multimedia file or null for other media types"
+				},
+				"url": {
+					"type": "string",
+					"format": "uri",
+					"description": "URL to download the file"
+				}
+			},
+			"required": [ "mediatype", "size", "width", "height", "duration", "url" ]
+		}
+	}
+}

includes/Rest/Handler/Schema/MediaLinks.json

@@ -0,0 +1,182 @@
+{
+	"description": "Media links for the page",
+	"required": [
+		"files"
+	],
+	"properties": {
+		"files": {
+			"type": "array",
+			"description": "Array of media used on the page",
+			"items": {
+				"type": "object",
+				"required": [
+					"title",
+					"file_description_url",
+					"latest",
+					"preferred",
+					"original"
+				],
+				"properties": {
+					"title": {
+						"type": "string",
+						"description": "File title"
+					},
+					"file_description_url": {
+						"type": "string",
+						"description": "URL for the page describing the file, including license information and other metadata"
+					},
+					"latest": {
+						"type": "object",
+						"nullable": true,
+						"description": "Information about the latest revision to the file",
+						"properties": {
+							"timestamp": {
+								"type": "string",
+								"format": "date-time",
+								"description": "Last modified timestamp in ISO 8601 format"
+							},
+							"user": {
+								"type": "object",
+								"description": "Information about the user who uploaded the file",
+								"properties": {
+									"id": {
+										"type": "integer",
+										"nullable": true,
+										"description": "User identifier"
+									},
+									"name": {
+										"type": "string",
+										"nullable": true,
+										"description": "Username"
+									}
+								},
+								"required": [
+									"id",
+									"name"
+								]
+							}
+						},
+						"required": [
+							"timestamp",
+							"user"
+						]
+					},
+					"preferred": {
+						"type": "object",
+						"nullable": true,
+						"description": "Information about the file's preferred preview format, original format, and thumbnail format",
+						"properties": {
+							"mediatype": {
+								"type": "string",
+								"enum": [
+									"BITMAP",
+									"DRAWING",
+									"AUDIO",
+									"VIDEO",
+									"MULTIMEDIA",
+									"UNKNOWN",
+									"OFFICE",
+									"TEXT",
+									"EXECUTABLE",
+									"ARCHIVE",
+									"3D"
+								],
+								"description": "The file type"
+							},
+							"size": {
+								"type": "integer",
+								"nullable": true,
+								"description": "File size in bytes or null if not available"
+							},
+							"width": {
+								"type": "integer",
+								"nullable": true,
+								"description": "Maximum recommended image width in pixels or null if not available"
+							},
+							"height": {
+								"type": "integer",
+								"nullable": true,
+								"description": "Maximum recommended image height in pixels or null if not available"
+							},
+							"duration": {
+								"type": "number",
+								"nullable": true,
+								"description": "The length of the video, audio, or multimedia file or null for other media types"
+							},
+							"url": {
+								"type": "string",
+								"format": "uri",
+								"description": "URL to download the file"
+							}
+						},
+						"required": [
+							"mediatype",
+							"size",
+							"width",
+							"height",
+							"duration",
+							"url"
+						]
+					},
+					"original": {
+						"type": "object",
+						"nullable": true,
+						"description": "Original file details",
+						"properties": {
+							"mediatype": {
+								"type": "string",
+								"enum": [
+									"BITMAP",
+									"DRAWING",
+									"AUDIO",
+									"VIDEO",
+									"MULTIMEDIA",
+									"UNKNOWN",
+									"OFFICE",
+									"TEXT",
+									"EXECUTABLE",
+									"ARCHIVE",
+									"3D"
+								],
+								"description": "The file type"
+							},
+							"size": {
+								"type": "integer",
+								"nullable": true,
+								"description": "File size in bytes or null if not available"
+							},
+							"width": {
+								"type": "integer",
+								"nullable": true,
+								"description": "Maximum recommended image width in pixels or null if not available"
+							},
+							"height": {
+								"type": "integer",
+								"nullable": true,
+								"description": "Maximum recommended image height in pixels or null if not available"
+							},
+							"duration": {
+								"type": "number",
+								"nullable": true,
+								"description": "The length of the video, audio, or multimedia file or null for other media types"
+							},
+							"url": {
+								"type": "string",
+								"format": "uri",
+								"description": "URL to download the file"
+							}
+						},
+						"required": [
+							"mediatype",
+							"size",
+							"width",
+							"height",
+							"duration",
+							"url"
+						]
+					}
+				}
+			}
+		}
+	}
+}

includes/Rest/Handler/Schema/NewPage.json

@@ -0,0 +1,62 @@
+{
+	"description": "The new page, including source (usually wikitext)",
+	"required": [
+		"id",
+		"title",
+		"key",
+		"latest",
+		"license",
+		"content_model",
+		"source"
+	],
+	"properties": {
+		"id": {
+			"type": "integer",
+			"description": "Page identifier"
+		},
+		"title": {
+			"type": "string",
+			"description": "Page title"
+		},
+		"key": {
+			"type": "string",
+			"description": "Page title in URL-friendly format"
+		},
+		"latest": {
+			"type": "object",
+			"description": "Information about the latest revision",
+			"properties": {
+				"id": {
+					"type": "integer",
+					"description": "Revision identifier for the latest revision"
+				},
+				"timestamp": {
+					"type": "string",
+					"description": " Timestamp of the latest revision"
+				}
+			}
+		},
+		"license": {
+			"type": "object",
+			"description": "Information about the wiki's license",
+			"properties": {
+				"url": {
+					"type": "string",
+					"description": "URL of the applicable license"
+				},
+				"title": {
+					"type": "string",
+					"description": "Name of the applicable license"
+				}
+			}
+		},
+		"content_model": {
+			"type": "string",
+			"description": "Page content type"
+		},
+		"source": {
+			"type": "string",
+			"description": "Page content in the format specified by the content_model property"
+		}
+	}
+}

includes/Rest/Handler/Schema/PageHistory.json

@@ -0,0 +1,78 @@
+{
+	"description": "Page revision history",
+	"required": [
+		"revisions",
+		"latest"
+	],
+	"properties": {
+		"revisions": {
+			"type": "array",
+			"description": "List of revisions of the page",
+			"items": {
+				"type": "object",
+				"required": [
+					"id",
+					"timestamp",
+					"minor",
+					"size",
+					"comment",
+					"user",
+					"delta"
+				],
+				"properties": {
+					"id": {
+						"type": "integer",
+						"description": "Unique revision identifier"
+					},
+					"timestamp": {
+						"type": "string",
+						"format": "date-time"
+					},
+					"minor": {
+						"type": "boolean",
+						"description": "True if the edit is marked as minor"
+					},
+					"size": {
+						"type": "integer",
+						"description": "Size of the revision in bytes"
+					},
+					"comment": {
+						"type": "string",
+						"nullable": true,
+						"description": "The comment the author associated with the revision"
+					},
+					"user": {
+						"type": "object",
+						"nullable": true,
+						"description": "Information about the user who made the revision",
+						"properties": {
+							"id": {
+								"type": "integer",
+								"nullable": true,
+								"description": "Unique identifier for the user; null for anonymous users"
+							},
+							"name": {
+								"type": "string",
+								"description": "Username of the editor, or IP address if the user is anonymous"
+							}
+						},
+						"required": [
+							"id",
+							"name"
+						]
+					},
+					"delta": {
+						"type": "integer",
+						"nullable": true,
+						"description": "Change in size between this revision and the preceding one; null if not available"
+					}
+				}
+			}
+		},
+		"latest": {
+			"type": "string",
+			"format": "uri",
+			"description": "URL to the latest revision of the page"
+		}
+	}
+}

includes/Rest/Handler/Schema/PageLanguageLinks.json

@@ -0,0 +1,30 @@
+{
+	"description": "Interlanguage links for the page",
+	"type": "array",
+	"items": {
+		"required": [
+			"code",
+			"name",
+			"key",
+			"title"
+		],
+		"properties": {
+			"code": {
+				"type": "string",
+				"description": "Language code"
+			},
+			"name": {
+				"type": "string",
+				"description": "Translated language name"
+			},
+			"key": {
+				"type": "string",
+				"description": "Translated page title in URL-friendly format"
+			},
+			"title": {
+				"type": "string",
+				"description": "Translated page title in reading-friendly format"
+			}
+		}
+	}
+}

includes/Rest/Handler/Schema/SearchResults.json

@@ -0,0 +1,84 @@
+{
+	"description": "Search results",
+	"required": [
+		"pages"
+	],
+	"properties": {
+		"pages": {
+			"type": "array",
+			"description": "List of search result pages",
+			"items": {
+				"type": "object",
+				"required": [
+					"id",
+					"key",
+					"title",
+					"excerpt",
+					"matched_title",
+					"description",
+					"thumbnail"
+				],
+				"properties": {
+					"id": {
+						"type": "integer",
+						"description": "Page identifier"
+					},
+					"key": {
+						"type": "string",
+						"description": "Page title in URL-friendly format"
+					},
+					"title": {
+						"type": "string",
+						"description": "Page title in reading-friendly format"
+					},
+					"excerpt": {
+						"type": "string",
+						"description": "Excerpt of the page content matching the search query"
+					},
+					"matched_title": {
+						"type": "string",
+						"nullable": true,
+						"description": "The title of a page redirection from, if applicable, or null"
+					},
+					"description": {
+						"type": "string",
+						"nullable": true,
+						"description": "Short summary of the page topic or null if no summary exists."
+					},
+					"thumbnail": {
+						"type": "object",
+						"nullable": true,
+						"description": "Information about the thumbnail image for the page, or null if no thumbnail exists.",
+						"properties": {
+							"mimetype": {
+								"type": "string",
+								"description": "The file type"
+							},
+							"width": {
+								"type": "integer",
+								"nullable": true,
+								"description": "Maximum recommended image width in pixels or null if not available"
+							},
+							"height": {
+								"type": "integer",
+								"nullable": true,
+								"description": "Maximum recommended image height in pixels or null if not available"
+							},
+							"duration": {
+								"type": "number",
+								"nullable": true,
+								"description": "The length of the video, audio, or multimedia file or null for other media types"
+							},
+							"url": {
+								"type": "string",
+								"format": "uri",
+								"description": "URL to download the file"
+							}
+						},
+						"required": [ "mimetype", "width", "height", "duration", "url" ]
+					}
+				}
+			}
+		}
+	}
+}

includes/Rest/Handler/SearchHandler.php

@@ -414,4 +414,8 @@ class SearchHandler extends Handler {
 			],
 		];
 	}
+
+	public function getResponseBodySchemaFileName( string $method ): ?string {
+		return 'includes/Rest/Handler/Schema/SearchResults.json';
+	}
 }

includes/Rest/Handler/UpdateHandler.php

@@ -253,4 +253,8 @@ class UpdateHandler extends EditHandler {
 		$json = ( $this->jsonDiffFunction )( $from->getText(), $to->getText(), 2 );
 		return FormatJson::decode( $json, true );
 	}
+
+	public function getResponseBodySchemaFileName( string $method ): ?string {
+		return 'includes/Rest/Handler/Schema/ExistingPageSource.json';
+	}
 }

includes/Rest/i18n/bn.json

@@ -6,7 +6,8 @@
 			"Sibabrata Banerjee",
 			"Sourav Halder",
 			"ZI Jony",
-			"আফতাবুজ্জামান"
+			"আফতাবুজ্জামান",
+			"Shariyar Nayeem"
 		]
 	},
 	"rest-prefix-mismatch": "অনুরোধকৃত পথ ($1) রেস্ট API মূলপথের ($2) ভিতরে ছিল না।",

includes/Rest/i18n/ce.json

@@ -4,10 +4,24 @@
 			"Умар"
 		]
 	},
+	"rest-prefix-mismatch": "Дехар дина некъ ($1) ца карийна REST API бух некъан ($2) йукъахь",
+	"rest-bad-prefix": "ДӀакхачоран некъ ($1) нийса модулан дешхьалхе йац.",
+	"rest-wrong-method": "Дехаран метод ($1) йацара {{{{PLURAL:$3|}}|оцу некъан бакъо йелла метод}} ($2)",
+	"rest-no-match": "Дехар дина гергара некъ ($1) нийса ца богӀу цхьана а бевзаш болчу лелоран агӀонашца",
+	"rest-unknown-module": "Дехар дина модулан цӀе ($1) йевзаш йац.",
+	"rest-nonexistent-title": "Билгалйина агӀо ($1) йац",
+	"rest-nonexistent-title-revision": "Билгалйаьккхина верси ($1) йац билгалйаьккхинчу агӀонна ($2)",
+	"rest-nonexistent-revision": "Дехар дина хийцам ($1) бац",
+	"rest-nonexistent-user": "Билгалвина декъашхо ($1) вац.",
+	"rest-invalid-user": "Билгалйаьккхина декъашхочун цӀе ($1) нийса йац",
+	"rest-invalid-ip": "Билгалдаьккхина IP ($1) нийса дац",
+	"rest-invalid-title": "Билгалйаьккхина цӀе ($1) вики-агӀонца лелаш йац.",
 	"rest-unsupported-content-type": "ТӀе ца оьцу Content-Type: $1",
+	"rest-permission-error": "ТӀекхача ца магийна: $1",
 	"rest-permission-denied-anon": "Аноним декъашхочун тӀекхочуш йац",
 	"rest-permission-denied-title": "Декъашхочун бакъонаш йац ($1) корта беша",
 	"rest-permission-denied-revision": "Йоьхуш йолу ($1) версин декъашхо тӀекхача ца ло.",
+	"rest-rate-limit-exceeded": "Чехкаллин лимит тӀехйаьлла. Дехар до, тӀаьхьо йуха а хьажа.",
 	"rest-resource-limit-exceeded": "Дехар кечдеш ресурсийн лимиташ совйьхна.",
 	"rest-pagehistory-incompatible-params": "«older_than» а, «newer_than» а параметрш цхьана чуйихка ца мега",
 	"rest-pagehistory-param-range-error": "Версин идентификатор хила йеза 0 сов",
@@ -16,7 +30,59 @@
 	"rest-pagehistorycount-parameters-invalid": "Билгалйина параметрийн комбинаци тӀе оьцуш йац.",
 	"rest-compare-page-mismatch": "Билгалйина версеш массийта агӀонийн йу, уьш йуьстилла дац.",
 	"rest-compare-permission-denied": "Йоьхуш йолу версин декъашхо тӀекхача ца ло.",
+	"rest-compare-nonexistent": "Параметр $1 билгалйаьккхина хийцам бац.",
+	"rest-compare-inaccessible": "$1 параметро билгалбаьккхина хийцам массо а берриге а тӀекхочуш бац.",
+	"rest-compare-wrong-content": "$2 ппараметро билгалйаьккхина йолу хас $1 чулацаман тайпа ду, тексте хийца йиш йоцуш.",
+	"rest-compare-wikidiff2": "ХӀокху чаккхенан меттиг wikidiff2 1.9.0 йа цул тӀаьхьара верси оьшу.",
+	"rest-pagehistorycount-too-many-revisions": "Билгалйаьккхинчу цӀарца тӀех дукха версеш йу, и барам схьаэца.",
+	"rest-search-error": "ГӀалат лехаман жамӀаш йухадерзорехь: $1",
+	"rest-page-source-type-error": "Дехначу агӀонан хьостан чулацаман тайпа ловш дац.",
+	"rest-no-revision": "$1 коьртана верси схьаэца аьтто ца баьлла.",
+	"rest-media-too-many-links": "ТӀех дукха медиа-хьажоргаш карийна $1 цӀарца (магийна $2)",
+	"rest-html-backend-error": "Parsoid HTML схьаэца аьтто бац: $1",
+	"rest-html-stash-failure": "Parsoid HTML къайлайаккха йиш йац.",
+	"rest-bad-json-body": "Нийса доцу дехаран дегӀ, JSON объект хила йеза.",
+	"rest-json-body-parse-error": "Дехаран дегӀ JSON санна синтаксин анализ йан аьтто ца баьлла: $1",
+	"rest-missing-body-field": "Дехаран дегӀехь оьшуш йолу меттиг «$1» йац.",
+	"rest-body-validation-error": "Дехаран нийса йоцу раж: $1",
+	"rest-extraneous-body-fields": "Дехаран декъехь карийна арахьара меттигаш: $1",
 	"rest-bad-content-model": "Чулацаман нийса йоцу модель: $1",
+	"rest-update-cannot-create-page": "«$1» агӀо кхолла йиш йац, хӀунда аьлча иза хӀинцале а йу. ХӀинца йолу агӀо карлайаккхархьама, структурехь билгалйаккха базин версин ID дехаран дегӀехь «latest» кӀел.",
+	"rest-extraneous-csrf-token": "Арахьара CSRF токен гучуйаьлла. CSRF токенаш лело ца йеза OAuth санна йолу аутентификацин механизмаш лелош, уьш кхерамза йу CSRF тӀелетарех.",
 	"rest-cannot-load-file": "«$1» коьртана файл чуйаккха мегаш дац.",
-	"rest-badtoken-nosession": "CSRF гӀалат — сеанс йац."
+	"rest-cross-origin-anon-write": "Тайп-тайпанчу хьостанашкара анониман дӀайаздар дехарш дихкина ду.",
+	"rest-requires-safe-against-csrf": "ХӀокху чаккхенан меттигна оьшу CSRF-кхерамза сеансийн провайдер.",
+	"rest-badtoken": "ДӀайелла CSRF токен нийса йац.",
+	"rest-badtoken-missing": "<var>token</var> параметр оьшу, нагахь санна CSRF-кхерамза аутентификацин метод лелош йацахь.",
+	"rest-badtoken-nosession": "CSRF гӀалат — сеанс йац.",
+	"rest-mock-error": "Харц гӀалат.",
+	"rest-specified-revision-unavailable": "Билгалйаьккхина верси дӀайаьккхина йа йохийна.",
+	"rest-previous-revision-unavailable": "Хьалха хилла верси ца карийра. АгӀо блоктоьхна йа дӀайаьккхина йу?",
+	"rest-requires-content-type-header": "Content-Type корта дӀабала беза пайдехьа дехаран халонца.",
+	"rest-transform-missing-html": "HTML-код ца йелла.",
+	"rest-transform-missing-title": "Цхьа а цӀе а, вики-текст а ца йелла.",
+	"rest-unsupported-target-format": "Дехар дина Ӏалашонан формат лелош йац.",
+	"rest-parsoid-resource-exceeded": "Ресурсийн лимит тӀехйаьлла",
+	"rest-parsoid-error": "Parsoid гӀалат.",
+	"rest-parsoid-bad-render-id": "Parsoid рендеран нийса йоцу идентификатор: $1",
+	"rest-bad-stash-key": "Къайлен нис ца луш долу догӀа.",
+	"rest-html-key-expected": "Хьоьжуш долу <var>HTML-</var> догӀа дегӀехь",
+	"rest-invalid-transform": "Нийса йоцу трансформаци: $1 - $2 кхаччалц.",
+	"rest-request-body-expected": "$1 дехаран методо хьоьжу дехаран дегӀе",
+	"rest-request-body-unaccepted": "$1 дехаран методо тӀе ца оьцу дехаран дегӀ",
+	"rest-unmapped-action-error": "Гайтина йоцу модулан гӀалаташ: $1.",
+	"rest-unsupported-transform-input": "Ловш доцу дӀайаздар: $1",
+	"rest-bad-etag": "Нийса йоцу ETag: $1",
+	"rest-unsupported-profile-version": "Профилан ловш йоцу верси: $1",
+	"rest-no-json-decode": "Пайдечу халонца JSON декодировка ца йо массивехь",
+	"rest-parsoid-unsupported-media": "Ловш доцу Медиа тайпа",
+	"rest-missing-revision-html": "html верси йац",
+	"rest-missing-revision-html-content-type": "html версин чулацаман тайпа дац.",
+	"rest-unsupported-profile-conversion": "Муха хийца деза ца хаьа тхуна.",
+	"rest-edit-conflict": "Тадарна дойнаш ($1)",
+	"rest-unknown-parsoid-transformation": "Ца йевза трансформаци.",
+	"rest-target-variant-required": "Ӏалашонан вариант йоьху.",
+	"rest-unsupported-language-conversion": "Ловш боцу мотт хийцар: $1 — $2",
+	"rest-unknown-content-model": "Чулацаман ца йевза модель: $1.",
+	"rest-page-bundle-validation-error": "PageBundle нийса ца йогӀу contentVersion: $1"
 }

includes/Rest/i18n/fr.json

@@ -9,21 +9,25 @@
 			"Thibaut120094",
 			"Verdy p",
 			"Wladek92",
-			"Mahabarata"
+			"Mahabarata",
+			"JLTRY",
+			"Bananax47",
+			"Derugon",
+			"Goombiis"
 		]
 	},
 	"rest-prefix-mismatch": "Le chemin demandé ($1) n’était pas dans le chemin de base de l’API REST ($2)",
 	"rest-bad-prefix": "Le chemin du point de terminaison ($1) ne contient pas de préfixe de module valide",
-	"rest-wrong-method": "La méthode requise ($1) n’était pas {{PLURAL:$3|la méthode autorisée pour ce chemin|une des méthodes autorisées pour ce chemin}} ($2)",
-	"rest-no-match": "Le chemin relatif requis ($1) ne correspondait à aucun gestionnaire connu",
+	"rest-wrong-method": "La méthode de la requête ($1) n’était pas {{PLURAL:$3|la méthode autorisée pour ce chemin|une des méthodes autorisées pour ce chemin}} ($2)",
+	"rest-no-match": "Le chemin relatif demandé ($1) ne correspondait à aucun gestionnaire connu",
 	"rest-unknown-module": "Le nom du module demandé ($1) est inconnu",
-	"rest-nonexistent-title": "Le page indiquée ($1) n’existe pas",
+	"rest-nonexistent-title": "La page spécifiée ($1) n’existe pas",
 	"rest-nonexistent-title-revision": "La version spécifiée ($1) n’existe pas pour la page spécifiée ($2)",
 	"rest-nonexistent-revision": "La version spécifiée ($1) n’existe pas",
-	"rest-nonexistent-user": "L’utilisateur ou l’utilisatrice « $1 » spécifié(e) n’existe pas.",
+	"rest-nonexistent-user": "L’utilisateur ou l’utilisatrice spécifié(e) ($1) n’existe pas",
 	"rest-invalid-user": "Le nom d’utilisateur spécifié ($1) n’est pas valide",
-	"rest-invalid-ip": "Le nom d’utilisateur spécifié ($1) n’est pas valide",
-	"rest-invalid-title": "Le titre spécifié ($1) ne fait pas référence à une page wiki.",
+	"rest-invalid-ip": "L’adresse IP spécifiée ($1) n’est pas valide",
+	"rest-invalid-title": "Le titre spécifié ($1) ne fait pas référence à une page du wiki.",
 	"rest-unsupported-content-type": "Content-Type non pris en charge : $1",
 	"rest-permission-error": "Autorisation refusée : $1",
 	"rest-permission-denied-anon": "Non accessible par un utilisateur anonyme",
@@ -32,31 +36,31 @@
 	"rest-rate-limit-exceeded": "Une limite de débit a été dépassée. Veuillez réessayer ultérieurement.",
 	"rest-resource-limit-exceeded": "Limites de ressources dépassées lors du traitement de la requête.",
 	"rest-pagehistory-incompatible-params": "Les paramètres « older_than » (plus ancien que) et « newer_than » (plus récent que) ne peuvent pas être spécifiés simultanément",
-	"rest-pagehistory-param-range-error": "L’ID de version doit être supérieur à 0",
+	"rest-pagehistory-param-range-error": "L’identifiant de version doit être supérieur à 0",
 	"rest-pagehistory-timestamp-error": "Impossible de récupérer l’horodatage de la version spécifiée ($1)",
-	"rest-pagehistorycount-type-unrecognized": "Le type de compteur indiqué ($1) est incorrect",
-	"rest-pagehistorycount-parameters-invalid": "La combinaison spécifiée de paramètres n’est pas prise en charge.",
-	"rest-compare-page-mismatch": "Les révisions spécifiées appartiennent à des pages différentes ; refus de les comparer.",
-	"rest-compare-permission-denied": "L’utilisateur n’a pas accès aux versions demandées.",
+	"rest-pagehistorycount-type-unrecognized": "Le type de compteur spécifié ($1) n’est pas valide",
+	"rest-pagehistorycount-parameters-invalid": "La combinaison de paramètres spécifiée n’est pas prise en charge.",
+	"rest-compare-page-mismatch": "Les versions spécifiées appartiennent à des pages différentes ; refus de les comparer.",
+	"rest-compare-permission-denied": "L’utilisateur n’a pas accès aux versions demandées",
 	"rest-compare-nonexistent": "La version spécifiée par le paramètre $1 n’existe pas.",
 	"rest-compare-inaccessible": "La version spécifiée par le paramètre $1 n’est pas accessible publiquement.",
 	"rest-compare-wrong-content": "L’emplacement $1 de la version spécifiée par le paramètre $2 a un type de contenu qui ne peut pas être converti en texte.",
 	"rest-compare-wikidiff2": "Ce point de terminaison nécessite wikidiff2 1.9.0 ou supérieur.",
 	"rest-pagehistorycount-too-many-revisions": "Le titre spécifié contient trop de versions pour en récupérer ce nombre.",
-	"rest-search-error": "Erreur en renvoyant les résultats de recherche : $1",
+	"rest-search-error": "Erreur en renvoyant les résultats de la recherche : $1",
 	"rest-page-source-type-error": "Le type de contenu de la page source demandée n’est pas pris en charge",
-	"rest-no-revision": "Impossible de récupérer la révision du titre $1",
-	"rest-media-too-many-links": "Trop de liens de média trouvés dans le titre $1 ($2 autorisés)",
+	"rest-no-revision": "Impossible de récupérer la version du titre $1",
+	"rest-media-too-many-links": "Trop de liens multimédias trouvés dans le titre $1 ($2 autorisés)",
 	"rest-html-backend-error": "Impossible de récupérer le HTML de Parsoid : $1",
-	"rest-html-stash-failure": "Impossible de stocker Parsoid HTML.",
+	"rest-html-stash-failure": "Impossible de stocker le HTML de Parsoid.",
 	"rest-bad-json-body": "Mauvais corps de requête, doit être un objet JSON.",
 	"rest-json-body-parse-error": "Échec de l’analyse du corps de la requête en JSON : $1",
 	"rest-missing-body-field": "Champ obligatoire « $1 » manquant dans le corps de la requête.",
-	"rest-body-validation-error": "Corps de requête invalide : $1",
-	"rest-extraneous-body-fields": "Champs supplémentaires trouvés dans le corps de la requête : $1",
+	"rest-body-validation-error": "Corps de requête non valide : $1",
+	"rest-extraneous-body-fields": "Champs superflus trouvés dans le corps de la requête : $1",
 	"rest-bad-content-model": "Mauvais modèle de contenu : $1",
-	"rest-update-cannot-create-page": "La page « $1 » n’a pas pu être créée car elle existe déjà. Pour mettre à jour la page existante, fournir l’identifiant de la révision de base dans la structure sous la clé « latest » (la plus récente) dans le corps de la requête.",
-	"rest-extraneous-csrf-token": "Jeton CRSF superflu trouvé. Les jetons CSRF ne doivent pas être utilisés lors de l’utilisation de mécanismes d’authentification tels que OAuth, qui sont sûrs vis-à-vis des attaques CSRF.",
+	"rest-update-cannot-create-page": "La page « $1 » n’a pas pu être créée car elle existe déjà. Pour mettre à jour la page existante, fournissez l’identifiant de la version de base dans la structure sous la clé « latest » (la plus récente) dans le corps de la requête.",
+	"rest-extraneous-csrf-token": "Jeton CRSF superflu trouvé. Les jetons CSRF ne doivent pas être utilisés lors de l’utilisation de mécanismes d’authentification tels qu’OAuth, qui sont sûrs vis-à-vis des attaques CSRF.",
 	"rest-cannot-load-file": "Le fichier de titre « $1 » n’a pas pu être chargé.",
 	"rest-cross-origin-anon-write": "Les requêtes d’écriture anonymes d’origine croisée ne sont pas autorisées",
 	"rest-requires-safe-against-csrf": "Ce point de terminaison exige un fournisseur de session qui protège des usurpations de sites (CSRF).",
@@ -64,32 +68,33 @@
 	"rest-badtoken-missing": "Le paramètre <var>token</var> est obligatoire à moins d’utiliser une méthode d’authentification sécurisée contre les attaques CSRF.",
 	"rest-badtoken-nosession": "Erreur CSRF — aucune session.",
 	"rest-mock-error": "Erreur de simulation.",
-	"rest-specified-revision-unavailable": "La modification spécifiée est supprimée.",
-	"rest-previous-revision-unavailable": "Impossible de trouver la modification précédente. La page a-t-elle été verrouillée ou supprimée ?",
-	"rest-requires-content-type-header": "Un en-tête Content-Type doit être fourni pour ce type de requête.",
-	"rest-transform-missing-html": "Aucun code HTML n'a été fourni.",
-	"rest-transform-missing-title": "Aucun titre ou codewiki n'a été fourni.",
-	"rest-unsupported-target-format": "Le format cible demandé n'est pas pris en charge.",
+	"rest-specified-revision-unavailable": "La modification spécifiée est supprimée ou masquée.",
+	"rest-previous-revision-unavailable": "Impossible de trouver la version précédente. La page a-t-elle été verrouillée ou supprimée ?",
+	"rest-requires-content-type-header": "Un en-tête Content-Type doit être fourni en combinaison avec une charge utile de requête.",
+	"rest-transform-missing-html": "Aucun HTML n’a été fourni.",
+	"rest-transform-missing-title": "Aucun titre ou wikitexte n’a été fourni.",
+	"rest-unsupported-target-format": "Le format cible demandé n’est pas pris en charge.",
 	"rest-parsoid-resource-exceeded": "Limite de ressources dépassée",
-	"rest-parsoid-error": "Erreur Parsoid.",
+	"rest-parsoid-error": "Erreur de Parsoid.",
+	"rest-parsoid-bad-render-id": "Mauvais identifiant de rendu de Parsoid : $1",
 	"rest-bad-stash-key": "Mauvaise clé de stockage.",
 	"rest-html-key-expected": "Clé <var>html</var> attendue dans le corps",
-	"rest-invalid-transform": "Transformation non valide : $1 à $2",
+	"rest-invalid-transform": "Transformation non valide : $1 vers $2",
 	"rest-request-body-expected": "La méthode de requête $1 nécessite un corps de requête",
-	"rest-request-body-unaccepted": "La méthode de requête $1 n'accepte pas de corps de requête",
-	"rest-unmapped-action-error": "Erreur du module d'action non mappé : $1",
+	"rest-request-body-unaccepted": "La méthode de requête $1 n’accepte pas de corps de requête",
+	"rest-unmapped-action-error": "Erreur du module d’action non mappé : $1",
 	"rest-unsupported-transform-input": "Entrée non prise en charge : $1",
 	"rest-bad-etag": "Mauvais ETag : $1",
 	"rest-unsupported-profile-version": "Version de profil non prise en charge : $1",
-	"rest-no-json-decode": "Payload ne se décode pas en JSON dans un tableau",
+	"rest-no-json-decode": "La charge utile ne se décode pas en tableau JSON",
 	"rest-parsoid-unsupported-media": "Type de média non pris en charge",
-	"rest-missing-revision-html": "Révision HTML manquante",
-	"rest-missing-revision-html-content-type": "Le Content-type de la révision HTML est manquant.",
+	"rest-missing-revision-html": "HTML de la version manquant",
+	"rest-missing-revision-html-content-type": "Le Content-type du HTML de la version est manquant.",
 	"rest-unsupported-profile-conversion": "Nous ne savons pas comment faire cette conversion.",
 	"rest-edit-conflict": "Conflit de modification ($1)",
 	"rest-unknown-parsoid-transformation": "Transformation inconnue.",
 	"rest-target-variant-required": "Une variante cible est requise.",
-	"rest-unsupported-language-conversion": "Conversion de formats non prise en charge : $1 à $2",
+	"rest-unsupported-language-conversion": "Conversion de formats non prise en charge : $1 vers $2",
 	"rest-unknown-content-model": "Modèle de contenu inconnu : $1",
 	"rest-page-bundle-validation-error": "PageBundle ne correspond pas à contentVersion : $1",
 	"rest-param-desc-revision-id": "Identifiant de la révision"

includes/Rest/i18n/gl.json

@@ -2,7 +2,8 @@
 	"@metadata": {
 		"authors": [
 			"Elisardojm",
-			"Toliño"
+			"Toliño",
+			"Xosecalvo"
 		]
 	},
 	"rest-prefix-mismatch": "O camiño solicitado ($1) non estaba no interior do camiño base da API REST ($2)",
@@ -24,18 +25,18 @@
 	"rest-permission-denied-revision": "O usuario non ten acceso á revisión solicitada ($1).",
 	"rest-rate-limit-exceeded": "Superouse un límite de peticións. Por favor, inténtao de novo máis tarde.",
 	"rest-resource-limit-exceeded": "Superáronse os límites de recursos ao procesar a solicitude.",
-	"rest-pagehistory-incompatible-params": "Non se poden especificar á vez os parámetros \"older_than\" e \"newer_than\"",
+	"rest-pagehistory-incompatible-params": "Non se poden especificar á vez os parámetros «older_than» e «newer_than»",
 	"rest-pagehistory-param-range-error": "O identificador da revisión debe ser maior que 0",
 	"rest-pagehistory-timestamp-error": "Non se puido recuperar a marca de tempo para a revisión especificada ($1)",
-	"rest-pagehistorycount-type-unrecognized": "O tipo de reconto especificado ($1) non é válido",
+	"rest-pagehistorycount-type-unrecognized": "O tipo de contaxe especificado ($1) non é válido",
 	"rest-pagehistorycount-parameters-invalid": "Non se admite a combinación de parámetros especificada.",
 	"rest-compare-page-mismatch": "As revisións especificadas pertencen a páxinas diferentes; non se poden comparar.",
 	"rest-compare-permission-denied": "O usuario non ten acceso ás revisións solicitadas",
-	"rest-compare-nonexistent": "A revisión especificada polo parámetro \"$1\" non existe.",
-	"rest-compare-inaccessible": "A revisión especificada polo parámetro \"$1\" non é de acceso público.",
-	"rest-compare-wrong-content": "O espazo \"$1\" da revisión especificada polo parámetro \"$2\" ten un tipo de contido que non se pode converter a texto.",
+	"rest-compare-nonexistent": "A revisión especificada polo parámetro «$1» non existe.",
+	"rest-compare-inaccessible": "A revisión especificada polo parámetro «$1» non é de acceso público.",
+	"rest-compare-wrong-content": "O espazo «$1» da revisión especificada polo parámetro «$2» ten un tipo de contido que non se pode converter a texto.",
 	"rest-compare-wikidiff2": "Este extremo necesita wikidiff2 1.9.0 ou posterior.",
-	"rest-pagehistorycount-too-many-revisions": "O título especificado contén demasiadas revisións para recuperar este reconto.",
+	"rest-pagehistorycount-too-many-revisions": "O título especificado contén demasiadas revisións para recuperar esta contaxe.",
 	"rest-search-error": "Erro ao devolver os resultados da busca: $1",
 	"rest-page-source-type-error": "O tipo de contido da páxina fonte solicitada non é compatible",
 	"rest-no-revision": "Non se puido recuperar a revisión do título $1",
@@ -44,13 +45,13 @@
 	"rest-html-stash-failure": "Non se puido almacenar o HTML de Parsoid.",
 	"rest-bad-json-body": "O corpo da solicitude é incorrecto, debe ser un obxecto JSON.",
 	"rest-json-body-parse-error": "Produciuse un erro ao analizar o corpo da solicitude como JSON: $1",
-	"rest-missing-body-field": "Falta o campo obrigatorio \"$1\" no corpo da solicitude.",
+	"rest-missing-body-field": "Falta o campo obrigatorio «$1» no corpo da solicitude.",
 	"rest-body-validation-error": "Corpo da solicitude non válido: $1",
 	"rest-extraneous-body-fields": "Atopáronse campos estraños no corpo da solicitude: $1",
 	"rest-bad-content-model": "Modelo de contido incorrecto: $1",
-	"rest-update-cannot-create-page": "Non se pode crear a páxina \"$1\" porque xa existe. Para actualizar a páxina existente, proporciona o identificador de revisión base na estrutura baixo a clave \"latest\" no corpo da solicitude.",
+	"rest-update-cannot-create-page": "Non se pode crear a páxina «$1» porque xa existe. Para actualizar a páxina existente, proporciona o identificador de revisión base na estrutura baixo a clave «latest» no corpo da solicitude.",
 	"rest-extraneous-csrf-token": "Atopouse un token CSRF estraño. Os tokens CSRF non se deben empregar cando se usan mecanismos de autenticación como OAuth que son seguros contra ataques CSRF.",
-	"rest-cannot-load-file": "Non se pode subir o ficheiro para o título \"$1\".",
+	"rest-cannot-load-file": "Non se pode subir o ficheiro co título «$1».",
 	"rest-cross-origin-anon-write": "Non se permiten as solicitudes de escritura anónimas entre orixes cruzadas",
 	"rest-requires-safe-against-csrf": "Este extremo necesita un provedor de sesión seguro contra ataques CSRF.",
 	"rest-badtoken": "O token CSRF proporcionado non é válido.",
@@ -65,7 +66,7 @@
 	"rest-unsupported-target-format": "O formato de destino solicitado non é compatible.",
 	"rest-parsoid-resource-exceeded": "Superouse o límite de recursos",
 	"rest-parsoid-error": "Erro de Parsoid.",
-	"rest-parsoid-bad-render-id": "ID de renderizado de Parsoid incorrecto: $1",
+	"rest-parsoid-bad-render-id": "ID de renderización de Parsoid incorrecto: $1",
 	"rest-bad-stash-key": "Clave de reserva incorrecta.",
 	"rest-html-key-expected": "Agardábase unha clave <var>html</var> no corpo",
 	"rest-invalid-transform": "Transformación non válida: $1 a $2",

includes/Rest/i18n/hu.json

@@ -1,34 +1,60 @@
 {
 	"@metadata": {
 		"authors": [
-			"Dj"
+			"Dj",
+			"Tacsipacsi"
 		]
 	},
-	"rest-prefix-mismatch": "A kért elérési út ($1) nem volt a REST API gyökérútvonalán ($2) belül.",
+	"rest-prefix-mismatch": "A kért elérési út ($1) nem volt a REST API gyökérútvonalán ($2) belül",
+	"rest-bad-prefix": "A végpont elérési útja ($1) nem tartalmaz érvényes modulelőtagot",
+	"rest-wrong-method": "A kérésmetódus ($1) nem az ezen az elérési úton engedélyezett {{PLURAL:$3|metódus ($2)|metódusok ($2) egyike}}",
+	"rest-no-match": "A kért relatív elérési út ($1) nem egyezett egyetlen ismert kezelővel sem",
+	"rest-unknown-module": "A kért modulnév ($1) nem ismert",
 	"rest-nonexistent-title": "A megadott lap ($1) nem létezik",
 	"rest-nonexistent-title-revision": "A megadott változat ($1) nem létezik a megadott lapon ($2)",
 	"rest-nonexistent-revision": "A megadott változat ($1) nem létezik",
 	"rest-nonexistent-user": "A megadott felhasználó ($1) nem létezik",
 	"rest-invalid-user": "A megadott felhasználónév ($1) érvénytelen",
-	"rest-invalid-title": "A megadott cím ($1) nem mutat wiki oldalra.",
-	"rest-unsupported-content-type": "Nem támogatott tartalomtípus: $1",
+	"rest-invalid-ip": "A megadott IP-cím ($1) érvénytelen",
+	"rest-invalid-title": "A megadott cím ($1) nem hivatkozik wikilapra.",
+	"rest-unsupported-content-type": "Nem támogatott Content-Type (tartalomtípus) fejléc: $1",
 	"rest-permission-error": "Engedély megtagadva: $1",
 	"rest-permission-denied-anon": "Névtelen felhasználó nem férhet hozzá",
-	"rest-permission-denied-title": "A felhasználónak nincs joga a cím olvasásához ($1)",
+	"rest-permission-denied-title": "A felhasználónak nincs jogosultsága a cím olvasásához ($1)",
 	"rest-permission-denied-revision": "A felhasználónak nincs hozzáférése a kért változathoz ($1).",
-	"rest-rate-limit-exceeded": "Túllépték a korlátot. Kérlek, próbáld újra később.",
-	"rest-resource-limit-exceeded": "Az erőforrás-korlátok túllépték a kérelem feldolgozását.",
+	"rest-rate-limit-exceeded": "Egy sebességkorlát túllépve. Próbáld újra később.",
+	"rest-resource-limit-exceeded": "Erőforrás-korlátok túllépve a kérés feldolgozása közben.",
 	"rest-pagehistory-incompatible-params": "Az „older_than” és „newer_than” paraméterek nem adhatók meg egyszerre",
 	"rest-pagehistory-param-range-error": "A változat azonosítójának nagyobbnak kell lennie 0-nál",
 	"rest-pagehistory-timestamp-error": "Nem sikerült lekérni az időbélyeget a megadott változathoz ($1)",
-	"rest-pagehistorycount-type-unrecognized": "A megadott számtípus ($1) érvénytelen",
+	"rest-pagehistorycount-type-unrecognized": "A megadott számlálótípus ($1) érvénytelen",
 	"rest-pagehistorycount-parameters-invalid": "A megadott paraméterkombináció nem támogatott.",
 	"rest-compare-page-mismatch": "A megadott változatok különböző oldalakhoz tartoznak; összehasonlítás megtagadva.",
 	"rest-compare-permission-denied": "A felhasználónak nincs hozzáférése a kért változatokhoz",
 	"rest-compare-nonexistent": "A $1 paraméter által megadott változat nem létezik.",
 	"rest-compare-inaccessible": "A $1 paraméter által megadott változat nem érhető el nyilvánosan.",
+	"rest-compare-wrong-content": "A(z) $2 paraméterrel megadott változat $1 része olyan tartalomtípust tartalmaz, amely nem alakítható szöveggé",
 	"rest-compare-wikidiff2": "Ehhez a végponthoz a wikidiff2 1.9.0 vagy újabb verziója szükséges.",
-	"rest-pagehistorycount-too-many-revisions": "A megadott cím túl sok revíziót tartalmaz a szám lekéréséhez.",
+	"rest-pagehistorycount-too-many-revisions": "A megadott cím túl sok lapváltozatot tartalmaz ennek a számlálónak a lekéréséhez.",
 	"rest-search-error": "Hiba a keresési eredmények visszaküldésekor: $1",
-	"rest-page-source-type-error": "A kért lapforrás tartalomtípusa nem támogatott"
+	"rest-page-source-type-error": "A kért lapforrás tartalomtípusa nem támogatott",
+	"rest-no-revision": "Nem sikerült lekérni a változatot a(z) $1 címhez",
+	"rest-media-too-many-links": "Túl sok médiára mutató hivatkozás található a(z) $1 címen ($2 engedélyezett)",
+	"rest-html-backend-error": "Nem sikerült lekérni a Parsoid-HTML-t: $1",
+	"rest-html-stash-failure": "Nem sikerült ideiglenesen tárolni a Parsoid-HTML-t.",
+	"rest-bad-json-body": "Érvénytelen kéréstörzs, JSON objektumnak kell lennie.",
+	"rest-json-body-parse-error": "A kérés törzsének JSON-ként történő feldolgozása sikertelen: $1",
+	"rest-missing-body-field": "A kötelező „$1” mező hiányzik a kérés törzséből.",
+	"rest-body-validation-error": "Érvénytelen kéréstörzs: $1",
+	"rest-extraneous-body-fields": "Felesleges mezők találhatók a kérés törzsében: $1",
+	"rest-bad-content-model": "Érvénytelen tartalommodell: $1",
+	"rest-update-cannot-create-page": "A(z) „$1” oldal nem hozható létre, mert már létezik. A meglévő oldal frissítéséhez add meg az alapváltozat azonosítóját a kérés törzsében a „latest” kulcs alatti struktúrában.",
+	"rest-extraneous-csrf-token": "Felesleges CSRF-token található. A CSRF-tokenek nem használhatók olyan hitelesítési mechanizmusokkal, mint az OAuth, amelyek biztonságosak a CSRF-támadásokkal szemben.",
+	"rest-cannot-load-file": "A(z) „$1” címhez tartozó fájl nem tölthető be.",
+	"rest-cross-origin-anon-write": "Névtelen, eltérő eredetű írási kérések nem engedélyezettek",
+	"rest-requires-safe-against-csrf": "Ez a végpont CSRF-biztos munkamenet-szolgáltatót igényel.",
+	"rest-badtoken": "A megadott CSRF-token érvénytelen.",
+	"rest-badtoken-missing": "A <var>token</var> paraméter megadása kötelező, kivéve CSRF-biztos hitelesítési módszert használata esetén.",
+	"rest-badtoken-nosession": "CSRF-hiba – nincs munkamenet.",
+	"rest-mock-error": "Tesztelési hiba."
 }

includes/Rest/i18n/ig.json

@@ -0,0 +1,43 @@
+{
+	"@metadata": {
+		"authors": [
+			"Epiphanus Jidechukwu"
+		]
+	},
+	"rest-prefix-mismatch": "Ụzọ a ịrịọrọ ($1) anọghị n'ime ụzọ isi REST API ($2)",
+	"rest-bad-prefix": "Ụzọ isinjedebe ($1) enweghị modul prefix dị irè",
+	"rest-wrong-method": "Usoro ịrịrịọ ($1) abụghị {{PLURAL:$3|usoro ekwenyere maka ụzọ a|otu n'ime ụzọ ekwenyere maka ụzọ a}} ($2)",
+	"rest-no-match": "Ụzọ ikwu nke a rịọrọ ($1) amakọghị na onye nlekọta a maara",
+	"rest-unknown-module": "Amaghị aha modul a rịọrọ ($1).",
+	"rest-nonexistent-title": "Ibe akọwapụtara ($1) adịghị",
+	"rest-nonexistent-title-revision": "Ndozigharị akọwapụtara ($1) adịghị maka ibe akọwapụtara ($2)",
+	"rest-nonexistent-revision": "Ntụgharị ahụ akọwapụtara ($1) adịghị",
+	"rest-nonexistent-user": "Onye ọrụ akọwapụtara ($1) adịghị",
+	"rest-invalid-user": "Aha njirimara akọwapụtara ($1) ekwesịghị ekwesị",
+	"rest-invalid-ip": "IP akọwapụtara ($1) ekwesịghị ekwesị",
+	"rest-invalid-title": "Aha akọwapụtara ($1) anaghị arụtụ aka na ibe wiki.",
+	"rest-unsupported-content-type": "Anaghị akwado ụdị ọdịnaya a: $1",
+	"rest-permission-error": "A jụrụ inye ikike: $1",
+	"rest-permission-denied-anon": "Onye ọrụ a na-amaghị aha ya enweghị ike ịnweta ya",
+	"rest-permission-denied-title": "Onye ọrụ enweghị ikike ịgụ isiokwu ($1)",
+	"rest-permission-denied-revision": "Onye ọrụ enweghị ike ịnweta nyocha a rịọrọ ($1).",
+	"rest-rate-limit-exceeded": "A gefere oke ọnụego. Biko nwaa ọzọ ma emechaa.",
+	"rest-resource-limit-exceeded": "Agafere oke akụrụngwa na nhazi arịrịọ a.",
+	"rest-pagehistory-incompatible-params": "Enweghị ike ịkọwapụta oke \"kachasị_okenye\" na \"kachasị_ọhụrụ\".",
+	"rest-pagehistory-param-range-error": "Id ntụgharị ga-adịrịrị ukwuu karịa 0",
+	"rest-pagehistory-timestamp-error": "Enweghị ike iweghachite akara oge maka mmezigharị akọwapụtara ($1)",
+	"rest-pagehistorycount-type-unrecognized": "Ụdị ọnụ ọgụgụ akọwapụtara ($1) adịghị ire",
+	"rest-pagehistorycount-parameters-invalid": "A kwadoghị nchikọta akọwapụtara.",
+	"rest-compare-page-mismatch": "Ndozigharị ndị akọwapụtara bụ nke ibe dị iche iche nwe; na-ajụ ịtụlee ha.",
+	"rest-compare-permission-denied": "Onye ọrụ enweghị ikike ịnweta nyocha a rịọrọ.",
+	"rest-compare-nonexistent": "Ndozigharị akọwapụtara site na oke $1 adịghị.",
+	"rest-compare-inaccessible": "Ndozigharị nke $1 kọwapụtara adịghị na nweta ọhaneze.",
+	"rest-compare-wrong-content": "Oghere $1 nke mmezigharị ahụ akọwapụtara site na paramita $2 nwere ụdị ọdịnaya nke enweghị ike ịtụgharị ka ọbụrụ ederede.",
+	"rest-compare-wikidiff2": "Ebe njedebe a chọrọ wikidiff2 1.9.0 ma ọ bụ karịa.",
+	"rest-search-error": "Njehie mgbe a na-eweghachi nsonaazụ ihe ịchọrọ: $1",
+	"rest-page-source-type-error": "Ụdị ọdịnaya nke isi iyi ibe a achọrọ akwadoghị ya",
+	"rest-no-revision": "Enweghị ike iweghachite mmezigharị maka isiokwu $1",
+	"rest-media-too-many-links": "Ahụrụ otụtụ njikọ mgbasa ozi na isiokwu $1 ($2 kwere)",
+	"rest-html-backend-error": "Enweghị ike ị nweta Parsoid HTML: $1",
+	"rest-bad-json-body": "Òtù arịrịọ ọjọọ, ga-abụrịrị ihe JSON."
+}

includes/Rest/i18n/ja.json

@@ -7,7 +7,8 @@
 			"Kokage si",
 			"MathXplore",
 			"Omotecho",
-			"Shirayuki"
+			"Shirayuki",
+			"Shulmj"
 		]
 	},
 	"rest-prefix-mismatch": "リクエストされたパス ($1) は REST API ベースパス ($2) 内にありませんでした",
@@ -18,8 +19,10 @@
 	"rest-nonexistent-revision": "指定された版 ($1) は存在しません",
 	"rest-nonexistent-user": "指定した利用者「$1」は存在しません",
 	"rest-invalid-user": "指定した利用者名（$1）は無効です",
+	"rest-invalid-ip": "指定したIP（$1）は無効です",
 	"rest-invalid-title": "指定されたタイトル ($1) はウィキページを示していません。",
 	"rest-unsupported-content-type": "非対応Content-Type：$1",
+	"rest-permission-error": "許可されていません: $1",
 	"rest-permission-denied-anon": "匿名利用者はアクセスできません",
 	"rest-permission-denied-title": "利用者にはページ名 ($1) の読み取り権限がありません",
 	"rest-permission-denied-revision": "利用者はリクエストした版 ($1) へのアクセス権がありません。",
@@ -35,7 +38,7 @@
 	"rest-compare-inaccessible": "パラメータ$1が指定した版は公開されていません。",
 	"rest-compare-wrong-content": "パラメータ$2が指定したスロット$1のコンテンツタイプはテキストに変換できません。",
 	"rest-compare-wikidiff2": "このエンドポイントは wikidiff2 1.9.0 以降が必要です。",
-	"rest-pagehistorycount-too-many-revisions": "指定したタイトルの版は多すぎるため、計数することができません。",
+	"rest-pagehistorycount-too-many-revisions": "指定されたページ名には版が多すぎるため、この件数を取得できません。",
 	"rest-search-error": "検索結果を返す時、エラーが発生しました：$1",
 	"rest-page-source-type-error": "リクエストしたページソースのコンテンツタイプはサポートされていません。",
 	"rest-no-revision": "タイトル$1の版を取得できません",
@@ -47,11 +50,12 @@
 	"rest-extraneous-body-fields": "リクエストボディで無関係なフィールドが見つかりました: $1",
 	"rest-bad-content-model": "無効なコンテンツモデル：$1",
 	"rest-update-cannot-create-page": "ページ「$1」が既に存在しているため、作成できません。既存のページを更新するには、リクエストボディにある「latest」の構造にベースとなる版を提供してください。",
-	"rest-extraneous-csrf-token": "外来の CSRF トークンを検出しました。OAuth のような CSRF 攻撃を防ぐ認証メカニズムを利用している場合は、CSRF トークンを使用することができません。",
-	"rest-cannot-load-file": "タイトル「$1」のファイルをロードできません。",
+	"rest-extraneous-csrf-token": "余分な CSRF トークンが見つかりました。OAuth のように CSRF 攻撃に対して安全な認証メカニズムを使用している場合、CSRF トークンは使用してはいけません。",
+	"rest-cannot-load-file": "ページ名「$1」のファイルを読み込めません。",
 	"rest-cross-origin-anon-write": "匿名のオリジン間書き込みリクエストは許可されません",
 	"rest-requires-safe-against-csrf": "このエンドポイントはCSRFを防げるセッションプロバイダーが必要です。",
 	"rest-badtoken": "与えられたCSRFトークンは無効です",
 	"rest-badtoken-missing": "CSRFを防げる認証方法を使用しない限り、<var>token</var>パラメータが必須です。",
-	"rest-badtoken-nosession": "CSRFエラー - sessionがありません。"
+	"rest-badtoken-nosession": "CSRFエラー - sessionがありません。",
+	"rest-edit-conflict": "編集の競合（$1）"
 }

includes/Rest/i18n/ko.json

@@ -3,7 +3,9 @@
 		"authors": [
 			"Bluehill",
 			"Suleiman the Magnificent Television",
-			"Ykhwong"
+			"Ykhwong",
+			"Tensama0415",
+			"YeBoy371"
 		]
 	},
 	"rest-prefix-mismatch": "요청한 경로($1)가 REST API 기본 경로($2) 안에 없었습니다",
@@ -56,6 +58,7 @@
 	"rest-badtoken": "제공된 CSRF 토큰이 잘못되었습니다.",
 	"rest-badtoken-missing": "CSRF 안전 인증 방법을 사용하지 않는 한 <var>token</var> 변수는 필수입니다.",
 	"rest-badtoken-nosession": "CSRF 오류 - 세션이 없습니다.",
+	"rest-mock-error": "가짜 오류.",
 	"rest-specified-revision-unavailable": "지정된 판은 삭제되었거나 숨겨져 있습니다.",
 	"rest-previous-revision-unavailable": "이전 판을 찾을 수 없습니다. 문서가 잠겼거나 삭제되었습니까?",
 	"rest-requires-content-type-header": "Content-Type 헤더는 요청 페이로드와 함께 제공되어야 합니다.",
@@ -64,6 +67,8 @@
 	"rest-unsupported-target-format": "요청한 대상 형식은 지원되지 않습니다.",
 	"rest-parsoid-resource-exceeded": "리소스 한도를 초과했습니다",
 	"rest-parsoid-error": "파소이드 오류입니다.",
+	"rest-parsoid-bad-render-id": "잘못된 파소이드 렌더 ID: $1",
+	"rest-invalid-transform": "유효하지 않은 변환: $1에서 $2",
 	"rest-request-body-expected": "$1 요청 메소드는 요청 본문을 예상합니다",
 	"rest-request-body-unaccepted": "$1 요청 메소드는 요청 본문을 허용하지 않습니다",
 	"rest-unmapped-action-error": "매핑되지 않은 작업 모듈 오류: $1",

includes/Rest/i18n/lb.json

@@ -5,10 +5,22 @@
 			"Volvox"
 		]
 	},
-	"rest-nonexistent-title": "D'Säit „$1“, déi ugi gouf, gëtt et net",
-	"rest-nonexistent-revision": "Déi spezifizéiert Versioun ($1) gëtt et net",
+	"rest-nonexistent-title": "D'Säit, déi ugi gouf, ($1) gëtt et net",
+	"rest-nonexistent-title-revision": "D'Versioun, déi ugi gouf, ($1) gëtt et net fir d'Säit, déi ugi gouf ($2)",
+	"rest-nonexistent-revision": "D'Versioun, déi ugi gouf, ($1) gëtt et net",
+	"rest-nonexistent-user": "De Benotzer, deen ugi gouf, ($1) gëtt et net",
+	"rest-invalid-user": "De Benotzernumm, deen ugi gouf, ($1) ass ongülteg",
+	"rest-invalid-ip": "D'IP, déi ugi gouf, ($1) ass ongülteg",
+	"rest-invalid-title": "Den Titel, deen ugi gouf, ($1) verweist net op eng Wikisäit.",
+	"rest-unsupported-content-type": "Net ënnerstëtzten Inhaltstyp: $1",
+	"rest-permission-denied-anon": "Net zougänglech fir anonym Benotzer",
 	"rest-permission-denied-title": "De Benotzer huet net d'Rechter fir den Titel ($1) ze liesen",
 	"rest-cannot-load-file": "De Fichier fir den Titel ''$1'' kann net geluede ginn.",
+	"rest-badtoken": "De CSRF-Token, deen ugi gouf, ass ongülteg.",
+	"rest-badtoken-nosession": "CSRF-Feeler – keng Sitzung.",
+	"rest-transform-missing-html": "Et gouf keen HTML geliwwert.",
+	"rest-transform-missing-title": "Et gouf keen Titel oder Wikitext uginn.",
+	"rest-parsoid-error": "Parsoid-Feeler.",
 	"rest-unsupported-transform-input": "Net ënnerstëtzten Input: $1",
 	"rest-unsupported-profile-version": "Net ënnerstëtzte Profilversioun: $1",
 	"rest-parsoid-unsupported-media": "Net ënnerstëtzte Medientyp",

includes/Rest/i18n/lij.json

@@ -0,0 +1,88 @@
+{
+	"@metadata": {
+		"authors": [
+			"N. Longo"
+		]
+	},
+	"rest-prefix-mismatch": "O percórso domandòu ($1) no l'é drénto a-o percórso bâze REST API ($2)",
+	"rest-bad-prefix": "O percórso de endpoint ($1) o no contêgne 'n prefìsso mòdolo vàlido.",
+	"rest-wrong-method": "O método domandòu ($1) o no l'é {{PLURAL:$3|'n método permìsso|un di métodi permìssi}} pe sto percórso chi ($2)",
+	"rest-no-match": "O percórso relatîvo ($1) o no coincìdde con di âtri controller conosciûi",
+	"rest-unknown-module": "O nómme do mòdolo domandòu ($1) o no l'é conosciûo",
+	"rest-nonexistent-title": "A pàgina indicâ ($1) a no l'exìste",
+	"rest-nonexistent-title-revision": "A versción domandâ ($1) a no l'é exìste pe-a pàgina indicâ ($2)",
+	"rest-nonexistent-revision": "A versción domandâ ($1) a no l'exìste",
+	"rest-nonexistent-user": "L'uténte indicòu ($1) o no l'exìste",
+	"rest-invalid-user": "O nómme uténte indicòu ($1) o no l'é vàlido",
+	"rest-invalid-ip": "L'IP indicòu ($1) o no l'é vàlido",
+	"rest-invalid-title": "O tìtolo indicòu ($1) o no se riferìsce a 'na pàgina wiki.",
+	"rest-unsupported-content-type": "Tîpo de contegnûo no suportòu: $1",
+	"rest-permission-error": "Permisción negâ: $1",
+	"rest-permission-denied-anon": "No acescìbile a-i uténti anònimi",
+	"rest-permission-denied-title": "L'uténte o no gh'à i dirìtti pe lêze o tìtolo ($1)",
+	"rest-permission-denied-revision": "L'uténte o no peu intrâ a-a versción domandâ ($1).",
+	"rest-rate-limit-exceeded": "In lìmite de tàsso o l'é stæto sconpasòu. Pe piâxéi, prêuva tórna ciù tàrdi.",
+	"rest-resource-limit-exceeded": "Sconpasòu i lìmiti de vivàgne pe elaborâ a domànda.",
+	"rest-pagehistory-incompatible-params": "No peu êse specificòu tùtti doî i paràmetri \"older_than\" e \"newer_than\"",
+	"rest-pagehistory-param-range-error": "ID versción o gh'à da êse ciù èrto de 0",
+	"rest-pagehistory-timestamp-error": "Inposcìbile repigiâ l'orâio pe-a versción indicâ ($1)",
+	"rest-pagehistorycount-type-unrecognized": "O tîpo de contézzo specificòu ($1) o no l'é vàlido",
+	"rest-pagehistorycount-parameters-invalid": "A conbinaçión de paràmetri specificâ a no l'é suportâ.",
+	"rest-compare-page-mismatch": "A versción specificâ a l'apartêgne a de pàgine diferénti; o paragón o l'é refuòu.",
+	"rest-compare-permission-denied": "L'uténte o no peu intrâ a-a versción domandâ.",
+	"rest-compare-nonexistent": "A versción specificâ do paràmetro $1 a no l'exìste.",
+	"rest-compare-inaccessible": "A versción specificâ da-o paràmetro $1 a no l'é acescìbile a-o pùblico.",
+	"rest-compare-wrong-content": "O spàçio $1 da versción specificâ pe-o paràmetro $2 a gh'à 'n tîpo de contegnûo ch'o no se peu trasformâ inte 'n tèsto.",
+	"rest-compare-wikidiff2": "St'endpoint chi o gh'à de bezéugno de wikidiff2 1.9.0 ò ciù modèrno.",
+	"rest-pagehistorycount-too-many-revisions": "O tìtolo indicòu o contêgne tròppe verscioìn pe repigiâ sto contézzo chi.",
+	"rest-search-error": "Erô into restitoî o rizultâto da riçèrca: $1",
+	"rest-page-source-type-error": "O tîpo de contegnûo da pàgina vivàgna domandâ o no l'é suportòu",
+	"rest-no-revision": "Inposcìbile repigiâ a versción pe-o tìtolo $1",
+	"rest-media-too-many-links": "Tròppi ligàmmi a media trovæ co-o tìtolo $1 (n'é permìsso $2)",
+	"rest-html-backend-error": "Inposcìbile repigiâ o Parsoid HTML: $1",
+	"rest-html-stash-failure": "Inposcìbile ascónde o Parsoid HTML.",
+	"rest-bad-json-body": "Còrpo da domànda no vàlido, o gh'à da êse 'n ògètto JSON.",
+	"rest-json-body-parse-error": "Anàlixi do còrpo da domànda cómme JSON falîa: $1",
+	"rest-missing-body-field": "O cànpo òbligatöio \"$1\" o mànca into còrpo da domànda.",
+	"rest-body-validation-error": "Còrpo da domànda no vàlido: $1",
+	"rest-extraneous-body-fields": "Cànpi forèsti trovæ into còrpo da domànda: $1",
+	"rest-bad-content-model": "Modéllo de contegnûo eròu: $1",
+	"rest-update-cannot-create-page": "A pàgina \"$1\" a no peu êse creâ scicómme ch'a l'exìste za. Pe métte a giórno a pàgina ch'a l'exìste za, indicâ l'ID versción bâze inta strutûa de sótta de \"l'ùrtima\" ciâve into còrpo domandòu.",
+	"rest-extraneous-csrf-token": "Token CSRF forèsto trovòu. I token CSRF no pêuan êse dêuviæ quànde se dêuvian di scistêmi de aotenticaçión cómme i OAuth, che són segûi cóntri i atàcchi CSRF.",
+	"rest-cannot-load-file": "O file pe-o tìtolo \"$1\" o no peu êse caregòu.",
+	"rest-cross-origin-anon-write": "E domànde de scritûa anònima d'òrìgine incroxâ no són permìsse",
+	"rest-requires-safe-against-csrf": "Sto endpoint chi o domànda 'n fornitô de seçioìn segûo pe CSRF.",
+	"rest-badtoken": "O token CSFR fornîo o no l'é vàlido.",
+	"rest-badtoken-missing": "O paràmetro <var>token</var> o l'é domandòu, levòu quànde se dêuvia 'n método d'aotenticaçión segûo pe CSRF.",
+	"rest-badtoken-nosession": "Erô CSRF - nisciùnn-a seçión.",
+	"rest-mock-error": "Erô de fâso.",
+	"rest-specified-revision-unavailable": "A versción indicâ a l'é stæta scancelâ ò soprèssa.",
+	"rest-previous-revision-unavailable": "No l'é stæto poscìbile trovâ a versción de prìmma. A pàgina a l'é stæta blocâ ò scancelâ?",
+	"rest-requires-content-type-header": "In'intestaçión Content-Type a dêv'êse fornîa co-in càrego ùtile de domànda.",
+	"rest-transform-missing-html": "Nisciùn html o l'é stæto fornîo.",
+	"rest-transform-missing-title": "Nisciùn tìtolo ò wikitèsto o l'é stæto fornîo.",
+	"rest-unsupported-target-format": "O formâto de destinaçión domandòu o no l'é suportòu.",
+	"rest-parsoid-resource-exceeded": "Sconpasòu o lìmite de vivàgne",
+	"rest-parsoid-error": "Erô de parsoid.",
+	"rest-parsoid-bad-render-id": "ID de réiza Parsoid gràmmo: $1",
+	"rest-bad-stash-key": "Ciâve de stash gràmma.",
+	"rest-html-key-expected": "Prevìsto 'na ciâve <var>html</var> into còrpo",
+	"rest-invalid-transform": "Trasformaçión no vàlida: $1 a $2",
+	"rest-request-body-expected": "O método de domànda $1 o prevédde 'n còrpo de domànda",
+	"rest-request-body-unaccepted": "O método de domànda $1 o prevédde 'n còrpo de domànda",
+	"rest-unmapped-action-error": "Erô do mòdolo d'açión no mapòu: $1",
+	"rest-unsupported-transform-input": "Input no suportòu: $1",
+	"rest-bad-etag": "ETag gràmmo: $1",
+	"rest-unsupported-profile-version": "Versción do profî no suportâ: $1",
+	"rest-no-json-decode": "O payload o no decodìfica o JSON inte 'n array",
+	"rest-parsoid-unsupported-media": "Tîpo de media no suportòu",
+	"rest-missing-revision-html": "O mànca a versción html",
+	"rest-missing-revision-html-content-type": "A versción html do tîpo de contegnûo a mànca.",
+	"rest-unsupported-profile-conversion": "No saxémmo cómme fâ sta conversción chi.",
+	"rest-edit-conflict": "Conflìtto d'ediçión ($1)",
+	"rest-unknown-parsoid-transformation": "Trasformaçión sconosciûa.",
+	"rest-target-variant-required": "A variànte de destinaçión a l'é necesâia.",
+	"rest-unsupported-language-conversion": "Conversción de léngoa no suportâ: $1 a $2",
+	"rest-unknown-content-model": "Modéllo de contegnûo sconosciûo: $1",
+	"rest-page-bundle-validation-error": "O PageBundle o no corispónde a-o contentVersion: $1"
+}

includes/Rest/i18n/nb.json

@@ -1,7 +1,8 @@
 {
 	"@metadata": {
 		"authors": [
-			"Jon Harald Søby"
+			"Jon Harald Søby",
+			"EdoAug"
 		]
 	},
 	"rest-prefix-mismatch": "Den forespurte stien ($1) var ikke i REST-API-ets grunnsti ($2)",
@@ -63,7 +64,23 @@
 	"rest-unsupported-target-format": "Det forespurte målformatet støttes ikke.",
 	"rest-parsoid-resource-exceeded": "Ressursgrense overskredet",
 	"rest-parsoid-error": "Parsoid-feil.",
+	"rest-parsoid-bad-render-id": "Ugyldig Paroid-rendrings-ID: $1",
 	"rest-bad-stash-key": "Ugyldig stash-nøkkel.",
 	"rest-html-key-expected": "Uventet <var>html</var>-nøkkel i brødteksten",
-	"rest-invalid-transform": "Ugyldig transformasjon: $1 til $2"
+	"rest-invalid-transform": "Ugyldig transformasjon: $1 til $2",
+	"rest-request-body-expected": "Forespørselsmetoden $1 forventer en forespørselstekst",
+	"rest-request-body-unaccepted": "Forespørselsmetoden $1 aksepterer ikke en forespørselstekst",
+	"rest-unsupported-transform-input": "Ustøttet inndata: $1",
+	"rest-bad-etag": "Ugyldig ETag: $1",
+	"rest-unsupported-profile-version": "Ustøttet profilversjon: $1",
+	"rest-parsoid-unsupported-media": "Ustøttet medietype",
+	"rest-missing-revision-html": "Mangler sideversjons-HTML",
+	"rest-missing-revision-html-content-type": "Innholdstypen til sideversjons-HTML-en mangler.",
+	"rest-unsupported-profile-conversion": "Vi vet ikke hvordan denne konverteringen kan gjøres.",
+	"rest-edit-conflict": "Redigeringskonflikt ($1)",
+	"rest-unknown-parsoid-transformation": "Ukjent transformering.",
+	"rest-target-variant-required": "Målvariant er påkrevd.",
+	"rest-unsupported-language-conversion": "Ustøttet språkkonvertering: $1 til $2",
+	"rest-unknown-content-model": "Ukjent innholdsmodell: $1",
+	"rest-page-bundle-validation-error": "PageBundle samsvarer ikke med contentVersion: $1"
 }

includes/Rest/i18n/nl.json

@@ -11,13 +11,13 @@
 	},
 	"rest-prefix-mismatch": "Het gevraagde pad ($1) bevind zich niet in het basispad van de REST API ($2)",
 	"rest-bad-prefix": "Het eindpuntpad ($1) bevat geen geldig modulevoorvoegsel",
-	"rest-wrong-method": "De requestmethode ($1) is {{PLURAL:$3|niet de toegestane methode voor dit pad|een van de toegestane methoden voor dit pad}} ($2)",
+	"rest-wrong-method": "De aanvraagmethode ($1) is niet {{PLURAL:$3|de toegestane methode|één van de toegestane methoden}} voor dit pad ($2)",
 	"rest-no-match": "Het gevraagde relatieve pad ($1) komt niet overeen met een bekende handler",
 	"rest-unknown-module": "De gevraagde modulenaam ($1) is niet bekend",
 	"rest-nonexistent-title": "De opgegeven pagina ($1) bestaat niet",
-	"rest-nonexistent-title-revision": "De opgegeven revisie ($1) bestaat niet voor de opgegeven pagina ($2)",
-	"rest-nonexistent-revision": "De opgevraagde versie ($1) bestaat niet",
-	"rest-nonexistent-user": "De opgegeven gebruiker ($1) bestaat niet.",
+	"rest-nonexistent-title-revision": "De opgegeven versie ($1) bestaat niet voor de opgegeven pagina ($2)",
+	"rest-nonexistent-revision": "De opgegeven versie ($1) bestaat niet",
+	"rest-nonexistent-user": "De opgegeven gebruiker ($1) bestaat niet",
 	"rest-invalid-user": "De opgegeven gebruikersnaam ($1) is niet geldig",
 	"rest-invalid-ip": "Het opgegeven IP-adres ($1) is ongeldig",
 	"rest-invalid-title": "De opgegeven titel ($1) verwijst niet naar een wikipagina.",
@@ -29,12 +29,12 @@
 	"rest-rate-limit-exceeded": "Er is een tempobeperking overschreden. Probeer het later nog eens.",
 	"rest-resource-limit-exceeded": "Er zijn systeembegrenzingen overschreden tijdens het verwerken van deze aanvraag.",
 	"rest-pagehistory-incompatible-params": "Parameters \"older_than\" en \"newer_than\" kunnen niet beide worden opgegeven",
-	"rest-pagehistory-param-range-error": "Versie ID moet groter zijn dan 0",
+	"rest-pagehistory-param-range-error": "Versie-ID moet groter zijn dan 0",
 	"rest-pagehistory-timestamp-error": "De datum en tijd van de aangegeven versie kunnen niet opgeroepen worden ($1)",
 	"rest-pagehistorycount-type-unrecognized": "Het opgegeven aantaltype ($1) is niet geldig",
 	"rest-pagehistorycount-parameters-invalid": "De opgegeven combinatie van parameters wordt niet ondersteund.",
 	"rest-compare-page-mismatch": "De opgegeven versies behoren tot verschillende pagina’s. Er wordt geweigerd ze te vergelijken.",
-	"rest-compare-permission-denied": "Gebruiker heeft geen toegang tot de gevraagde herzieningen",
+	"rest-compare-permission-denied": "Gebruiker heeft geen toegang tot de gevraagde versies",
 	"rest-compare-nonexistent": "De door de parameter “$1” opgegeven versie bestaat niet.",
 	"rest-compare-inaccessible": "De door de parameter “$1” opgegeven versie is niet openbaar toegankelijk.",
 	"rest-compare-wrong-content": "Het segment “$1” van de door de parameter “$2” opgegeven versie is van een inhoudstype dat niet naar tekst kan worden omgezet.",
@@ -69,6 +69,7 @@
 	"rest-unsupported-target-format": "Het gevraagde doelformaat wordt niet ondersteund.",
 	"rest-parsoid-resource-exceeded": "Limiet systeembelasting overschreden",
 	"rest-parsoid-error": "Fout van Parsoid.",
+	"rest-parsoid-bad-render-id": "Onjuiste Parsoid-render-ID: $1",
 	"rest-bad-stash-key": "Foutieve opbergsleutel.",
 	"rest-html-key-expected": "Er wordt een <var>html</var>-sleutel in de tekst verwacht",
 	"rest-invalid-transform": "Ongeldige transformatie: $1 naar $2",

includes/Rest/i18n/pl.json

@@ -5,27 +5,31 @@
 			"Pietrasagh",
 			"Rail",
 			"Rainbow P",
-			"Woytecr"
+			"Woytecr",
+			"Nux"
 		]
 	},
-	"rest-prefix-mismatch": "Żądana ścieżka ($1) nie była wewnątrz ścieżki root REST API ($2)",
-	"rest-wrong-method": "Żądana metoda ($1) nie była{{PLURAL:$3|dozwoloną metodą dla tej ścieżki|jedną z dozwolonych metod dla tej ścieżki}} ($2)",
+	"rest-prefix-mismatch": "Żądana ścieżka ($1) nie była wewnątrz ścieżki bazowej REST API ($2)",
+	"rest-bad-prefix": "Ścieżka punktu końcowego ($1) nie zawiera prawidłowego przedrostka modułu",
+	"rest-wrong-method": "Żądana metoda ($1) nie była {{PLURAL:$3|dozwoloną metodą dla tej ścieżki|jedną z dozwolonych metod dla tej ścieżki}} ($2)",
 	"rest-no-match": "Żądana względna ścieżka ($1) nie pasowała do żadnego modułu obsługi",
+	"rest-unknown-module": "Żądana nazwa modułu ($1) jest nieznana",
 	"rest-nonexistent-title": "Podana strona ($1) nie istnieje",
 	"rest-nonexistent-title-revision": "Podana wersja ($1) strony ($2) nie istnieje",
-	"rest-nonexistent-revision": "Żądana wersja ($1) nie istnieje.",
+	"rest-nonexistent-revision": "Żądana wersja ($1) nie istnieje",
 	"rest-nonexistent-user": "Podany użytkownik ($1) nie istnieje",
 	"rest-invalid-user": "Podana nazwa użytkownika ($1) jest nieprawidłowa",
+	"rest-invalid-ip": "Podany adres IP ($1) jest nieprawidłowy",
 	"rest-invalid-title": "Podany tytuł ($1) nie odnosi się do strony na wiki.",
 	"rest-unsupported-content-type": "Nieobsługiwany typ treści: $1",
 	"rest-permission-error": "Brak dostępu: $1",
 	"rest-permission-denied-anon": "Niedostępne dla anonimowego użytkownika",
 	"rest-permission-denied-title": "Użytkownik nie posiada uprawnień do czytania tytułu ($1)",
 	"rest-permission-denied-revision": "Użytkownik nie ma dostępu do żądanej wersji ($1).",
-	"rest-rate-limit-exceeded": "Przekroczono limit przepustowości. Spróbuj ponownie poźniej.",
+	"rest-rate-limit-exceeded": "Przekroczono limit przepustowości. Spróbuj ponownie później.",
 	"rest-resource-limit-exceeded": "Podczas wykonywania żądania przekroczono limit użycia zasobów.",
 	"rest-pagehistory-incompatible-params": "Parametry „older_than” i „newer_than” nie mogą być podawane razem",
-	"rest-pagehistory-param-range-error": "ID wersji musi być większe niż 0",
+	"rest-pagehistory-param-range-error": "Identyfikator wersji musi być większe niż 0",
 	"rest-pagehistory-timestamp-error": "Nie można pozyskać czasu dla podanej wersji ($1)",
 	"rest-pagehistorycount-type-unrecognized": "Podany typ liczenia ($1) jest niepoprawny",
 	"rest-pagehistorycount-parameters-invalid": "Podana kombinacja parametrów nie jest wspierana.",
@@ -34,8 +38,8 @@
 	"rest-compare-nonexistent": "Wersja podana przez parametr $1 nie istnieje.",
 	"rest-compare-inaccessible": "Wersja podana przez parametr $1 nie jest publicznie dostępna.",
 	"rest-compare-wrong-content": "Slot $1 wersji podanej przez parametr $2 posiada typ treści, który nie może zostać zamieniony na tekst.",
-	"rest-compare-wikidiff2": "Ten endpoint wymaga oprogramowania wikidiff2 w wersji 1.9.0 lub nowszej.",
-	"rest-pagehistorycount-too-many-revisions": "Podany tytuł zawiera za dużo wersji aby móc pobrać tę liczbę.",
+	"rest-compare-wikidiff2": "Ten punkt końcowy wymaga oprogramowania wikidiff2 w wersji 1.9.0 lub nowszej.",
+	"rest-pagehistorycount-too-many-revisions": "Podany tytuł zawiera za dużo wersji, aby móc pobrać tę liczbę.",
 	"rest-search-error": "Błąd podczas zwracania wyników wyszukiwania: $1",
 	"rest-page-source-type-error": "Typ zawartości żądanej strony źródłowej jest niewspierany",
 	"rest-no-revision": "Nie udało się pobrać wersji dla tytułu $1",
@@ -50,12 +54,17 @@
 	"rest-extraneous-csrf-token": "Znaleziono obcy token CSRF. Nie można używać tokenów CSRF podczas korzystania z mechanizmów uwierzytelniania takich jak OAuth, które są odporne na ataki CSRF.",
 	"rest-cannot-load-file": "Plik o tytule „$1” nie mógł zostać wczytany.",
 	"rest-cross-origin-anon-write": "Anonimowe żądania zapisu w innych domen nie są dozwolone",
-	"rest-requires-safe-against-csrf": "Ten endpoint wymaga sesji odpornej na CSRF.",
+	"rest-requires-safe-against-csrf": "Ten punkt końcowy wymaga sesji odpornej na CSRF.",
 	"rest-badtoken": "Podany token CSRF jest nieprawidłowy.",
 	"rest-badtoken-missing": "Parametr <var>token</var> jest wymagany, chyba że używana jest bezpieczna dla CSRF metoda uwierzytelniania.",
 	"rest-badtoken-nosession": "Błąd CSRF – brak sesji.",
 	"rest-specified-revision-unavailable": "Wskazana wersja została usunięta lub ukryta.",
 	"rest-previous-revision-unavailable": "Nie można znaleźć poprzedniej wersji. Czy strona została zablokowana lub usunięta?",
 	"rest-transform-missing-html": "Nie podano kodu HTML.",
-	"rest-transform-missing-title": "Nie podano tytułu albo wikitekstu."
+	"rest-transform-missing-title": "Nie podano tytułu albo wikitekstu.",
+	"rest-unsupported-target-format": "Żądany format docelowy nie jest wspierany.",
+	"rest-parsoid-resource-exceeded": "Przekroczono limit zasobów",
+	"rest-parsoid-error": "Błąd Parsoida.",
+	"rest-parsoid-bad-render-id": "Identyfikator problematycznego renderowania Parsoida: $1",
+	"rest-html-key-expected": "Oczekiwano klucza <var>html</var> w zawartości"
 }

includes/Rest/i18n/ps.json

@@ -0,0 +1,16 @@
+{
+	"@metadata": {
+		"authors": [
+			"شاه زمان پټان"
+		]
+	},
+	"rest-invalid-user": "ټاکل شوی کارن‌نوم ($1) ناچله دی",
+	"rest-mock-error": "خيالي تېروتنه.",
+	"rest-specified-revision-unavailable": "ځانگړې‌شوې بیاکتنه ړنگه‌شوې يا ځپل‌شوې ده.",
+	"rest-previous-revision-unavailable": "پخوانۍ بیاکتنه ونهٔ موندل شوه. ايا مخ تاله‌شوی يا ړنگ‌شوی دی؟",
+	"rest-transform-missing-html": "هېڅ اېچ‌ټي‌اېم‌اېل نه دی ورکړل‌شوی.",
+	"rest-transform-missing-title": "هېڅ سرليک يا ويکي‌ليک نه دی ورکړل‌شوی.",
+	"rest-unsupported-target-format": "غوښتل‌شوې موخې بڼه نه ملاتړ کېږي.",
+	"rest-parsoid-resource-exceeded": "سرچينې حد زيات شوی",
+	"rest-parsoid-error": "پارسويډ تېروتنه"
+}

includes/Rest/i18n/pt-br.json

@@ -5,7 +5,9 @@
 			"Eduardoaddad",
 			"Felipe L. Ewald",
 			"Jhonnatanricardo",
-			"Re demz"
+			"Re demz",
+			"Ninawauwau",
+			"Mitternachtvega"
 		]
 	},
 	"rest-prefix-mismatch": "O caminho pedido ($1) não estava no interior do caminho raiz da API REST ($2)",
@@ -17,9 +19,11 @@
 	"rest-nonexistent-user": "O usuário especificado ($1) não existe",
 	"rest-invalid-user": "O nome de usuário especificado ($1) é inválido",
 	"rest-unsupported-content-type": "Tipo de conteúdo não supportado: $1",
+	"rest-permission-error": "Permissão negada: $1",
 	"rest-permission-denied-anon": "Não acessível por usuário anônimo",
 	"rest-permission-denied-title": "O usuário não tem o direitos de ler o título ($1)",
 	"rest-permission-denied-revision": "O usuário não tem acesso à revisão solicitada ($1).",
+	"rest-rate-limit-exceeded": "Limite de taxa excedido. Por favor, tente novamente mais tarde.",
 	"rest-resource-limit-exceeded": "Limites de recursos ultrapassados ao processar o pedido.",
 	"rest-pagehistory-incompatible-params": "Os parâmetros \"older_than\" ''(anterior a)'' e \"newer_than\" ''(posterior a)'' não podem ser especificados em simultâneo",
 	"rest-pagehistory-param-range-error": "O ID da revisão deve ser maior que 0",
@@ -37,7 +41,7 @@
 	"rest-page-source-type-error": "O tipo de conteúdo da fonte da página solicitada não é suportado",
 	"rest-no-revision": "Não foi possível recuperar a revisão para o título $1",
 	"rest-media-too-many-links": "Muitos links de mídia encontrados no título $1 ($2 permitidos)",
-	"rest-html-backend-error": "Não foi possível buscar o HTML Parsoid",
+	"rest-html-backend-error": "Não foi possível buscar o HTML Parsoid: $1",
 	"rest-bad-json-body": "Corpo de solicitação inválido, deve ser um objeto JSON.",
 	"rest-json-body-parse-error": "A análise do corpo da solicitação como JSON falhou: $1",
 	"rest-missing-body-field": "Campo obrigatório \"$1\" ausente do corpo da solicitação.",

includes/Rest/i18n/ru.json

@@ -7,17 +7,24 @@
 			"Katunchik",
 			"Megakott",
 			"Okras",
-			"Vlad5250"
+			"Vlad5250",
+			"Cabadeck",
+			"Yurina Tatiana",
+			"Mitte27",
+			"Engineer56"
 		]
 	},
 	"rest-prefix-mismatch": "Запрашиваемый путь ($1) не найден внутри базового пути REST API ($2)",
+	"rest-bad-prefix": "Путь к конечному пункту ($1) не содержит допустимого префикса модуля.",
 	"rest-wrong-method": "Метод запроса ($1) не был {{{{PLURAL:$3|}}|разрешённым методом для этого пути|одним из разрешённых методов для этого пути}} ($2)",
 	"rest-no-match": "Запрошенный относительный путь ($1) не соответствует ни одному известному обработчику",
+	"rest-unknown-module": "Запрошенное имя модуля ($1) неизвестно.",
 	"rest-nonexistent-title": "Указанной страницы ($1) не существует",
 	"rest-nonexistent-title-revision": "Указанной версии ($1) не существует для указанной страницы ($2)",
 	"rest-nonexistent-revision": "Запрошенная редакция ($1) не существует",
 	"rest-nonexistent-user": "Указанный пользователь ($1) не существует",
 	"rest-invalid-user": "Указанное имя участника ($1) некорректно",
+	"rest-invalid-ip": "Указанный IP ($1) некорректен",
 	"rest-invalid-title": "Указанный заголовок ($1) не относится к вики-странице.",
 	"rest-unsupported-content-type": "Неподдерживаемый Content-Type: $1",
 	"rest-permission-error": "Доступ запрещён: $1",
@@ -57,6 +64,12 @@
 	"rest-badtoken": "Предоставленный CSRF-токен недействителен.",
 	"rest-badtoken-missing": "Параметр <var>token</var> является обязательным, если только не используется метод аутентификации, безопасный для CSRF.",
 	"rest-badtoken-nosession": "Ошибка CSRF — нет сеанса.",
+	"rest-specified-revision-unavailable": "Указанная версия удалена или подавлена.",
+	"rest-previous-revision-unavailable": "Не удалось найти предыдущую версию. Страница была заблокирована или удалена?",
+	"rest-requires-content-type-header": "Заголовок Content-Type должен быть предоставлен вместе с полезной нагрузкой запроса.",
+	"rest-transform-missing-html": "HTML-код не предоставлен.",
+	"rest-transform-missing-title": "Ни заголовка, ни викитекста предоставлено не было.",
+	"rest-unsupported-target-format": "Запрошенный целевой формат не поддерживается.",
 	"rest-parsoid-error": "Ошибка Parsoid.",
 	"rest-html-key-expected": "Ожидаемый <var>HTML-</var> ключ в теле",
 	"rest-unsupported-transform-input": "Неподдерживаемый ввод: $1",

includes/Rest/i18n/sl.json

@@ -15,6 +15,7 @@
 	"rest-nonexistent-revision": "Navedena redakcija ($1) ne obstaja",
 	"rest-nonexistent-user": "Navedeni uporabnik ($1) ne obstaja",
 	"rest-invalid-user": "Navedeno uporabniško ime ($1) je neveljavno",
+	"rest-invalid-ip": "Navedeni IP ($1) je neveljaven",
 	"rest-invalid-title": "Navedeni naslov ($1) se ne nanaša na viki stran.",
 	"rest-unsupported-content-type": "Nepodprta vrsta vsebine: $1",
 	"rest-permission-error": "Dovoljenje zavrnjeno: $1",
@@ -44,6 +45,7 @@
 	"rest-bad-json-body": "Neustrezno telo zahtevke, biti mora objekt JSON.",
 	"rest-json-body-parse-error": "Razčlenjevanje telesa zahtevka kot JSON ni uspelo: $1",
 	"rest-missing-body-field": "Telesu zahtevka manjka obvezno polje »$1«.",
+	"rest-body-validation-error": "Neveljavno telo zahtevka: $1",
 	"rest-extraneous-body-fields": "Dodatna polja v telesu zahtevka: $1",
 	"rest-bad-content-model": "Neustrezen vsebinski model: $1",
 	"rest-update-cannot-create-page": "Strani »$1« ni mogoče ustvariti, ker že obstaja. Za posodobitev obstoječe strani navedite ID osnovne redakcije v strukturi v telesu zahtevka pod ključem »latest« (najnovejše).",
@@ -53,5 +55,35 @@
 	"rest-requires-safe-against-csrf": "Ta končna točka zahteva ponudnika, ki zagotavlja zaščito pred ugrabitvijo sej (CSRF).",
 	"rest-badtoken": "Predloženi žeton CSRF je neveljaven.",
 	"rest-badtoken-missing": "Potreben je parameter <var>token</var>, razen če uporabljate CSRF-varen način avtentikacije.",
-	"rest-badtoken-nosession": "Napaka CSRF – ni seje."
+	"rest-badtoken-nosession": "Napaka CSRF – ni seje.",
+	"rest-mock-error": "Simulirana napaka.",
+	"rest-specified-revision-unavailable": "Navedena redakcija je izbrisana ali skrita.",
+	"rest-previous-revision-unavailable": "Prejšnje redakcije ni bilo mogoče najti. Ali je bila stran zaklenjena ali izbrisana?",
+	"rest-requires-content-type-header": "V kombinaciji s tovorom zahtevka mora biti podana glava Content-Type.",
+	"rest-transform-missing-html": "Predložen ni bil noben HTML.",
+	"rest-transform-missing-title": "Predložen ni bil noben naslov ali vikibesedilo.",
+	"rest-unsupported-target-format": "Zahtevani ciljni format ni podprt.",
+	"rest-parsoid-resource-exceeded": "Presežena omejitev virov",
+	"rest-parsoid-error": "Napaka Parsoida.",
+	"rest-parsoid-bad-render-id": "Napačen ID upodabljanja Parsoid: $1",
+	"rest-bad-stash-key": "Neveljaven shranjevalni ključ.",
+	"rest-html-key-expected": "Pričakovan ključ <var>html</var> v telesu",
+	"rest-invalid-transform": "Neveljavna transformacija: $1 v $2",
+	"rest-request-body-expected": "Metoda zahtevka $1 zahteva telo zahtevka",
+	"rest-request-body-unaccepted": "Metoda zahtevka $1 ne sprejme telesa zahtevka.",
+	"rest-unmapped-action-error": "Napaka modula nepreslikanega dejanja: $1",
+	"rest-unsupported-transform-input": "Nepodprt vnos: $1",
+	"rest-bad-etag": "Slab ETag: $1",
+	"rest-unsupported-profile-version": "Nepodprta različica profila: $1",
+	"rest-no-json-decode": "Uporabni tovor ne dekodira JSON v matriko",
+	"rest-parsoid-unsupported-media": "Nepodprta vrsta predstavnosti",
+	"rest-missing-revision-html": "Manjkajoč HTML redakcije",
+	"rest-missing-revision-html-content-type": "Manjka Content-Type HTML-ja redakcije.",
+	"rest-unsupported-profile-conversion": "Ne vemo, kako izvesti to pretvorbo.",
+	"rest-edit-conflict": "Navzkrižje urejanj ($1)",
+	"rest-unknown-parsoid-transformation": "Neznana transformacija.",
+	"rest-target-variant-required": "Potrebna je ciljna varianta.",
+	"rest-unsupported-language-conversion": "Nepodprta jezikovna pretvorba: $1 v $2",
+	"rest-unknown-content-model": "Neznan vsebinski model: $1",
+	"rest-page-bundle-validation-error": "PageBundle se ne ujema s contentVersion: $1"
 }

includes/Rest/i18n/sv.json

@@ -6,7 +6,7 @@
 			"WikiPhoenix"
 		]
 	},
-	"rest-prefix-mismatch": "Den begärda sökvägen ($1) fanns inte inuti rotsökvägen för REST API ($2)",
+	"rest-prefix-mismatch": "Den begärda sökvägen ($1) fanns inte inuti bassökvägen för REST API ($2)",
 	"rest-wrong-method": "Den begärda metoden ($1) var inte {{PLURAL:$3|den tillåtna metoden för denna sökväg|en av de tillåtna metoderna för denna sökväg}} ($2)",
 	"rest-no-match": "Den begärda relativa sökvägen ($1) matchade inte några kända hanterare",
 	"rest-nonexistent-title": "Den angivna titeln ($1) finns inte.",
@@ -15,6 +15,7 @@
 	"rest-nonexistent-user": "Den angivna användaren ($1) finns inte",
 	"rest-invalid-user": "Det angivna användarnamnet ($1) är ogiltigt",
 	"rest-unsupported-content-type": "Innehållstyp som inte stöds: $1",
+	"rest-permission-error": "Behörighet nekad: $1",
 	"rest-permission-denied-anon": "Inte tillgänglig för anonyma användare",
 	"rest-permission-denied-title": "Användaren har inte behörighet att läsa titeln ($1)",
 	"rest-permission-denied-revision": "Användaren har inte åtkomst till den begärda sidversionen ($1).",
@@ -48,5 +49,6 @@
 	"rest-requires-safe-against-csrf": "Denna slutpunkt kräver en CSRF-säker sessionsleverantör.",
 	"rest-badtoken": "Den angivna CSRF-nyckeln är ogiltig.",
 	"rest-badtoken-missing": "Parametern <var>token</var> krävs om inte en CSRF-säker autentiseringsmetod används.",
-	"rest-badtoken-nosession": "CSRF-fel - ingen session."
+	"rest-badtoken-nosession": "CSRF-fel - ingen session.",
+	"rest-mock-error": "Testfel."
 }

includes/Rest/i18n/tr.json

@@ -9,7 +9,7 @@
 			"Stonecy"
 		]
 	},
-	"rest-prefix-mismatch": "İstenen yol ($1), REST API kök yolunun içinde değildi ($2)",
+	"rest-prefix-mismatch": "İstenen yol ($1), REST API temel yolunun ($2) içinde değildi",
 	"rest-wrong-method": "İstek yöntemi ($1), {{PLURAL:$3|bu yol için izin verilen yöntem|bu yol için izin verilen yöntemlerden biri}}  değildi ($2)",
 	"rest-no-match": "İstenen göreceli yol ($1) bilinen herhangi bir işleyiciyle eşleşmedi",
 	"rest-nonexistent-title": "Belirtilen sayfa ($1) yok",

includes/Rest/i18n/uk.json

@@ -7,7 +7,8 @@
 			"Vlad5250",
 			"Ата",
 			"Пан Хаунд",
-			"Marvire"
+			"Marvire",
+			"METROKOP228 UA"
 		]
 	},
 	"rest-prefix-mismatch": "Зазначений шлях ($1) не знайдено всередині базового шляху REST API ($2)",

includes/Rest/i18n/zh-hans.json

@@ -14,7 +14,14 @@
 			"Tr jason",
 			"VulpesVulpes825",
 			"沈澄心",
-			"铁桶"
+			"铁桶",
+			"Administrator66",
+			"Kcx36",
+			"Lily9814",
+			"Mishidexfc",
+			"Peterxy12",
+			"WaitSpring",
+			"范"
 		]
 	},
 	"rest-prefix-mismatch": "请求的路径（$1）不在REST API基本路径（$2）中",
@@ -77,6 +84,7 @@
 	"rest-unsupported-target-format": "不支持请求的目标格式。",
 	"rest-parsoid-resource-exceeded": "超出资源限制",
 	"rest-parsoid-error": "Parsoid错误。",
+	"rest-parsoid-bad-render-id": "错误的Parsoid渲染ID：$1",
 	"rest-bad-stash-key": "错误的stash key。",
 	"rest-html-key-expected": "正文中应包含<var>html</var>键",
 	"rest-invalid-transform": "无效转换：$1到$2",

includes/Rest/i18n/zh-hant.json

@@ -4,7 +4,10 @@
 			"Kly",
 			"Xiplus",
 			"列维劳德",
-			"捍粵者"
+			"捍粵者",
+			"August.C",
+			"Peterxy12",
+			"Taiwania Justo"
 		]
 	},
 	"rest-prefix-mismatch": "請求的路徑（$1）不在REST API的基本路徑（$2）內",
@@ -67,6 +70,7 @@
 	"rest-unsupported-target-format": "不支援的請求目標格式。",
 	"rest-parsoid-resource-exceeded": "超出資源限制",
 	"rest-parsoid-error": "Parsoid 錯誤。",
+	"rest-parsoid-bad-render-id": "错误的Parsoid渲染ID：$1",
 	"rest-bad-stash-key": "錯誤的 stash key。",
 	"rest-html-key-expected": "正文裡預期的 <var>html</var> 鍵",
 	"rest-invalid-transform": "無效轉換：$1成$2",

includes/ServiceWiring.php

@@ -83,6 +83,7 @@ use MediaWiki\Config\ConfigFactory;
 use MediaWiki\Config\ConfigRepository;
 use MediaWiki\Config\ServiceOptions;
 use MediaWiki\Content\ContentHandlerFactory;
+use MediaWiki\Content\ContentJsonCodec;
 use MediaWiki\Content\IContentHandlerFactory;
 use MediaWiki\Content\Renderer\ContentRenderer;
 use MediaWiki\Content\Transform\ContentTransformer;
@@ -575,7 +576,6 @@ return [
 			$services->getLinkBatchFactory(),
 			$services->getLinkCache(),
 			$services->getRepoGroup(),
-			RequestContext::getMain()->getLanguage(),
 			$services->getContentLanguage(),
 			$services->getTitleParser(),
 			$services->getNamespaceInfo(),
@@ -631,6 +631,12 @@ return [
 		);
 	},
 
+	'ContentJsonCodec' => static function ( MediaWikiServices $services ): ContentJsonCodec {
+		return new ContentJsonCodec(
+			$services->getContentHandlerFactory(),
+		);
+	},
+
 	'ContentLanguage' => static function ( MediaWikiServices $services ): Language {
 		return $services->getLanguageFactory()->getLanguage(
 			$services->getMainConfig()->get( MainConfigNames::LanguageCode ) );
@@ -1654,7 +1660,7 @@ return [
 			: $services->getMainObjectStash();
 
 		return new SimpleParsoidOutputStash(
-			$services->getContentHandlerFactory(),
+			$services->getJsonCodec(),
 			$backend,
 			$config['StashDuration']
 		);

includes/Setup.php

@@ -129,15 +129,17 @@ require_once MW_INSTALL_PATH . '/includes/Defines.php';
 // Assert that composer dependencies were successfully loaded
 if ( !interface_exists( LoggerInterface::class ) ) {
 	$message = (
-		'MediaWiki requires the <a href="https://github.com/php-fig/log">PSR-3 logging ' .
-		"library</a> to be present. This library is not embedded directly in MediaWiki's " .
-		"git repository and must be installed separately by the end user.\n\n" .
+		'<strong>Error: Missing external libraries.</strong> ' .
+		'MediaWiki depends on external libraries bundled with most MediaWiki distributions. ' .
+		"When installing MediaWiki from its Git reposistory, these must be installed separately.\n\n" .
 		'Please see the <a href="https://www.mediawiki.org/wiki/Download_from_Git' .
 		'#Fetch_external_libraries">instructions for installing libraries</a> on mediawiki.org ' .
-		'for help on installing the required components.'
+		'for help on installing the required libraries.'
 	);
+	http_response_code( 500 );
 	echo $message;
-	trigger_error( $message, E_USER_ERROR );
+	error_log( $message );
+	exit( 1 );
 }
 
 // Deprecated global variable for backwards-compatibility.

includes/actions/RevertAction.php

@@ -71,6 +71,7 @@ class RevertAction extends FormAction {
 	}
 
 	public function getRestriction() {
+		// Required permissions of revert are complicated, will be checked below.
 		return 'upload';
 	}
 
@@ -78,6 +79,16 @@ class RevertAction extends FormAction {
 		if ( $this->getTitle()->getNamespace() !== NS_FILE ) {
 			throw new ErrorPageError( $this->msg( 'nosuchaction' ), $this->msg( 'nosuchactiontext' ) );
 		}
+
+		$rights = [ 'reupload' ];
+		if ( $user->equals( $this->getFile()->getUploader() ) ) {
+			// reupload-own is more basic, put it in the front for error messages.
+			array_unshift( $rights, 'reupload-own' );
+		}
+		if ( !$user->isAllowedAny( ...$rights ) ) {
+			throw new PermissionsError( $rights[0] );
+		}
+
 		parent::checkCanExecute( $user );
 
 		$oldimage = $this->getRequest()->getText( 'oldimage' );

includes/api/ApiComparePages.php

@@ -279,9 +279,18 @@ class ApiComparePages extends ApiBase {
 	 */
 	private function getRevisionById( $id ) {
 		$rev = $this->revisionStore->getRevisionById( $id );
+
+		if ( $rev ) {
+			$this->checkTitleUserPermissions( $rev->getPage(), 'read' );
+		}
+
 		if ( !$rev && $this->getAuthority()->isAllowedAny( 'deletedtext', 'undelete' ) ) {
 			// Try the 'archive' table
 			$rev = $this->archivedRevisionLookup->getArchivedRevisionRecord( null, $id );
+
+			if ( $rev ) {
+				$this->checkTitleUserPermissions( $rev->getPage(), 'deletedtext' );
+			}
 		}
 		return $rev;
 	}

includes/api/ApiFeedContributions.php

@@ -111,7 +111,7 @@ class ApiFeedContributions extends ApiBase {
 			$this->dieWithError( 'apierror-sizediffdisabled' );
 		}
 
-		$msg = $this->msg( 'Contributions' )->inContentLanguage()->text();
+		$msg = $this->msg( 'Contributions' )->inContentLanguage()->escaped();
 		$feedTitle = $config->get( MainConfigNames::Sitename ) . ' - ' . $msg .
 			' [' . $config->get( MainConfigNames::LanguageCode ) . ']';
 
@@ -125,7 +125,7 @@ class ApiFeedContributions extends ApiBase {
 
 		$feed = new $feedClasses[$params['feedformat']] (
 			$feedTitle,
-			htmlspecialchars( $msg ),
+			$msg,
 			$feedUrl
 		);
 
@@ -235,7 +235,7 @@ class ApiFeedContributions extends ApiBase {
 	 * @return string
 	 */
 	protected function feedItemDesc( RevisionRecord $revision ) {
-		$msg = $this->msg( 'colon-separator' )->inContentLanguage()->text();
+		$msg = $this->msg( 'colon-separator' )->inContentLanguage()->escaped();
 		try {
 			$content = $revision->getContent( SlotRecord::MAIN );
 		} catch ( RevisionAccessException $e ) {

includes/api/ApiFileRevert.php

@@ -61,6 +61,12 @@ class ApiFileRevert extends ApiBase {
 
 		// Check whether we're allowed to revert this file
 		$this->checkTitleUserPermissions( $this->file->getTitle(), [ 'edit', 'upload' ] );
+		$rights = [ 'reupload' ];
+		if ( $this->getUser()->equals( $this->file->getUploader() ) ) {
+			// reupload-own is more basic, put it in the front for error messages.
+			array_unshift( $rights, 'reupload-own' );
+		}
+		$this->checkUserRightsAny( $rights );
 
 		$sourceUrl = $this->file->getArchiveVirtualUrl( $this->archiveName );
 		$status = $this->file->upload(

includes/api/ApiLogin.php

@@ -136,7 +136,7 @@ class ApiLogin extends ApiBase {
 
 		// Try bot passwords
 		if ( $authRes === false && $this->getConfig()->get( MainConfigNames::EnableBotPasswords ) ) {
-			$botLoginData = BotPassword::canonicalizeLoginData( $params['name'], $params['password'] );
+			$botLoginData = BotPassword::canonicalizeLoginData( $params['name'] ?? '', $params['password'] ?? '' );
 			if ( $botLoginData ) {
 				$status = BotPassword::login(
 					$botLoginData[0], $botLoginData[1], $this->getRequest()

includes/api/ApiMain.php

@@ -178,6 +178,7 @@ class ApiMain extends ApiBase {
 				'UserFactory',
 				'UrlUtils',
 				'TitleFormatter',
+				'JsonCodec',
 			]
 		],
 		'stashedit' => [

includes/api/ApiMessageTrait.php

@@ -66,6 +66,7 @@ trait ApiMessageTrait {
 		'importuploaderrorpartial' => 'partialupload',
 		'importuploaderrorsize' => 'filetoobig',
 		'importuploaderrortemp' => 'notempdir',
+		'ipb-block-not-found' => 'alreadyblocked',
 		'ipb_already_blocked' => 'alreadyblocked',
 		'ipb_blocked_as_range' => 'blockedasrange',
 		'ipb_cant_unblock' => 'cantunblock',

includes/api/ApiParse.php

@@ -33,6 +33,7 @@ use MediaWiki\Content\Transform\ContentTransformer;
 use MediaWiki\Context\DerivativeContext;
 use MediaWiki\EditPage\EditPage;
 use MediaWiki\Json\FormatJson;
+use MediaWiki\Json\JsonCodec;
 use MediaWiki\Language\RawMessage;
 use MediaWiki\Languages\LanguageNameUtils;
 use MediaWiki\Message\Message;
@@ -61,6 +62,7 @@ use Skin;
 use SkinFactory;
 use Wikimedia\ParamValidator\ParamValidator;
 use Wikimedia\ParamValidator\TypeDef\EnumDef;
+use Wikimedia\Parsoid\Core\TOCData;
 use WikiPage;
 
 /**
@@ -95,6 +97,7 @@ class ApiParse extends ApiBase {
 	private UserFactory $userFactory;
 	private UrlUtils $urlUtils;
 	private TitleFormatter $titleFormatter;
+	private JsonCodec $jsonCodec;
 
 	public function __construct(
 		ApiMain $main,
@@ -113,7 +116,8 @@ class ApiParse extends ApiBase {
 		TempUserCreator $tempUserCreator,
 		UserFactory $userFactory,
 		UrlUtils $urlUtils,
-		TitleFormatter $titleFormatter
+		TitleFormatter $titleFormatter,
+		JsonCodec $jsonCodec
 	) {
 		parent::__construct( $main, $action );
 		$this->revisionLookup = $revisionLookup;
@@ -131,6 +135,7 @@ class ApiParse extends ApiBase {
 		$this->userFactory = $userFactory;
 		$this->urlUtils = $urlUtils;
 		$this->titleFormatter = $titleFormatter;
+		$this->jsonCodec = $jsonCodec;
 	}
 
 	private function getPoolKey(): string {
@@ -605,6 +610,13 @@ class ApiParse extends ApiBase {
 		}
 		if ( isset( $prop['sections'] ) ) {
 			$result_array['sections'] = $p_result->getSections();
+		}
+		if ( isset( $prop['tocdata'] ) ) {
+			$result_array['tocdata'] = $this->jsonCodec->toJsonArray(
+				$p_result->getTOCData(), TOCData::class
+			);
+		}
+		if ( isset( $prop['sections'] ) || isset( $prop['tocdata'] ) ) {
 			$result_array['showtoc'] = $p_result->getOutputFlag( ParserOutputFlags::SHOW_TOC );
 		}
 		if ( isset( $prop['parsewarnings'] ) ) {
@@ -736,6 +748,7 @@ class ApiParse extends ApiBase {
 			'externallinks' => 'el',
 			'iwlinks' => 'iw',
 			'sections' => 's',
+			'tocdata' => 'toc',
 			'headitems' => 'hi',
 			'modules' => 'm',
 			'indicators' => 'ind',
@@ -1081,7 +1094,7 @@ class ApiParse extends ApiBase {
 			],
 			'prop' => [
 				ParamValidator::PARAM_DEFAULT => 'text|langlinks|categories|links|templates|' .
-					'images|externallinks|sections|revid|displaytitle|iwlinks|' .
+					'images|externallinks|sections|tocdata|revid|displaytitle|iwlinks|' .
 					'properties|parsewarnings',
 				ParamValidator::PARAM_ISMULTI => true,
 				ParamValidator::PARAM_TYPE => [
@@ -1094,6 +1107,7 @@ class ApiParse extends ApiBase {
 					'images',
 					'externallinks',
 					'sections',
+					'tocdata',
 					'revid',
 					'displaytitle',
 					'subtitle',

includes/api/ApiQueryAllPages.php

@@ -152,7 +152,7 @@ class ApiQueryAllPages extends ApiQueryGeneratorBase {
 			$forceNameTitleIndex = false;
 		}
 
-		if ( isset( $params['maxsize'] ) ) {
+		if ( !$miserMode && isset( $params['maxsize'] ) ) {
 			$this->addWhere( 'page_len<=' . (int)$params['maxsize'] );
 			$forceNameTitleIndex = false;
 		}
@@ -363,6 +363,7 @@ class ApiQueryAllPages extends ApiQueryGeneratorBase {
 
 		if ( $this->getConfig()->get( MainConfigNames::MiserMode ) ) {
 			$ret['filterredir'][ApiBase::PARAM_HELP_MSG_APPEND] = [ 'api-help-param-limited-in-miser-mode' ];
+			$ret['maxsize'][ApiBase::PARAM_HELP_MSG_APPEND] = [ 'api-help-param-disabled-in-miser-mode' ];
 		}
 
 		return $ret;

includes/api/ApiQueryBlocks.php

@@ -234,8 +234,9 @@ class ApiQueryBlocks extends ApiQueryBase {
 		}
 
 		if ( !$this->getAuthority()->isAllowed( 'hideuser' ) ) {
+			$this->addWhere( [ 'bl_deleted' => 0 ] );
 			$this->addWhere(
-				$this->hideUserUtils->getExpression( $db, $db->tableName( 'block_target' ) . '.bt_user' )
+				$this->hideUserUtils->getExpression( $db, 'block_target.bt_user' )
 			);
 		}
 

includes/api/ApiQueryImageInfo.php

@@ -196,7 +196,8 @@ class ApiQueryImageInfo extends ApiQueryBase {
 					$info['badfile'] = (bool)$this->badFileLookup->isBadFile( $title, $badFileContextTitle );
 				}
 
-				$fit = $result->addValue( [ 'query', 'pages' ], (int)$pageId, $info );
+				// Use ApiResult::IGNORE_CONFLICT_KEYS, the module is extended and the value can be set twice (T402438)
+				$fit = $result->addValue( [ 'query', 'pages' ], (int)$pageId, $info, ApiResult::IGNORE_CONFLICT_KEYS );
 				if ( !$fit ) {
 					if ( count( $pageIds[NS_FILE] ) == 1 ) {
 						// The user is screwed. imageinfo can't be solely

includes/api/ApiQueryRevisionsBase.php

@@ -248,7 +248,7 @@ abstract class ApiQueryRevisionsBase extends ApiQueryGeneratorBase {
 			if ( $params['diffto'] == 'cur' ) {
 				$params['diffto'] = 0;
 			}
-			if ( ( !ctype_digit( $params['diffto'] ) || $params['diffto'] < 0 )
+			if ( ( !ctype_digit( (string)$params['diffto'] ) || $params['diffto'] < 0 )
 				&& $params['diffto'] != 'prev' && $params['diffto'] != 'next'
 			) {
 				$p = $this->getModulePrefix();

includes/api/ApiResult.php

@@ -73,6 +73,13 @@ class ApiResult implements ApiSerializable {
 	 */
 	public const NO_VALIDATE = self::NO_SIZE_CHECK | 8;
 
+	/**
+	 * For addValue(), setValue() and similar functions, do allow override
+	 * of conflicting keys.
+	 * @since 1.45 (also backported to 1.43.6, 1.44.3)
+	 */
+	public const IGNORE_CONFLICT_KEYS = 16;
+
 	/**
 	 * Key for the 'indexed tag name' metadata item. Value is string.
 	 * @since 1.25
@@ -309,7 +316,7 @@ class ApiResult implements ApiSerializable {
 			}
 		} elseif ( is_array( $arr[$name] ) && is_array( $value ) ) {
 			$conflicts = array_intersect_key( $arr[$name], $value );
-			if ( !$conflicts ) {
+			if ( !$conflicts || ( $flags & self::IGNORE_CONFLICT_KEYS ) ) {
 				$arr[$name] += $value;
 			} else {
 				$keys = implode( ', ', array_keys( $conflicts ) );