summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReedy <reedy@wikimedia.org>2023-12-21 16:43:34 +0000
committerReedy <reedy@wikimedia.org>2023-12-21 16:43:34 +0000
commit3406e1b7d014d22f2a68237ebf447a88b5ac74ed (patch)
tree50018cd9d6ba030dd3470fb162d8018f47a2165f
parente6c7924de3a5fcc1f65dde9519421c9b41abda7b (diff)
Prep 1.39.61.39.6
Change-Id: I892eb3adfb1316c53148d65997ee95ce0439ba20
-rw-r--r--RELEASE-NOTES-1.396
-rw-r--r--includes/Defines.php2
2 files changed, 5 insertions, 3 deletions
diff --git a/RELEASE-NOTES-1.39 b/RELEASE-NOTES-1.39
index c5b49b09dfba..bb20b2edceff 100644
--- a/RELEASE-NOTES-1.39
+++ b/RELEASE-NOTES-1.39
@@ -7,7 +7,7 @@ PHP 8.3 workboard: https://phabricator.wikimedia.org/tag/php_8.3_support/
== MediaWiki 1.39.6 ==
-THIS IS NOT A RELEASE YET
+This is a security and maintenance release of the MediaWiki 1.39 branch.
=== Changes since MediaWiki 1.39.5 ===
* Localisation updates.
@@ -22,7 +22,8 @@ THIS IS NOT A RELEASE YET
* Updated wikimedia/timestamp from 4.0.0 to 4.1.1.
* tests: Provide coverage for StatusValue::__toString.
* StatusValue: Improve logging/debug output with multibyte characters.
-* logging: Fix non-escaped messages used in rights log.
+* (T347726, CVE-2023-PENDING) SECURITY: logging: Fix non-escaped messages
+ used in rights log.
* Updated wikimedia/parsoid from 0.16.1 to 0.16.2.
* (T229992) LocalisationCache: Preserve fallback source language info.
* (T275085) Fix logging Status objects to 'authevents' channel.
@@ -32,6 +33,7 @@ THIS IS NOT A RELEASE YET
* SwiftFileBackend: Fix "PHP Deprecated: strlen(): Passing null to parameter #1
($string) of type string is deprecated".
* maintenance: Add missing parenthesis to SQL in attachLatest.php.
+* (T353472) maintenance: Fix join condition in DeduplicateArchiveRevId.
== MediaWiki 1.39.5 ==
diff --git a/includes/Defines.php b/includes/Defines.php
index 182c62d04be0..ce4ce0fdc53f 100644
--- a/includes/Defines.php
+++ b/includes/Defines.php
@@ -33,7 +33,7 @@ use Wikimedia\Rdbms\IDatabase;
*
* @since 1.35 (also backported to 1.33.3 and 1.34.1)
*/
-define( 'MW_VERSION', '1.39.5' );
+define( 'MW_VERSION', '1.39.6' );
/** @{
* Obsolete IDatabase::makeList() constants