diff options
author | csteipp <csteipp@wikimedia.org> | 2015-08-10 13:35:11 -0700 |
---|---|---|
committer | Chad Horohoe <chadh@wikimedia.org> | 2015-08-10 22:01:35 +0000 |
commit | e1b441650669cecd9509dde3c8b355a05127e66c (patch) | |
tree | 507335de14d78cf5c772bc93131d600fd14e851c | |
parent | 5a88c9cba9aa4c16b6a279324bafcb679185ccfa (diff) |
Update Releasenotes and version number for 1.25.21.25.2
Change-Id: Idb92283cf1fbd73d73fec98fbbc3e4e86e0de47e
-rw-r--r-- | RELEASE-NOTES-1.25 | 6 | ||||
-rw-r--r-- | includes/DefaultSettings.php | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/RELEASE-NOTES-1.25 b/RELEASE-NOTES-1.25 index 4e27538f9524..6d32a44565c1 100644 --- a/RELEASE-NOTES-1.25 +++ b/RELEASE-NOTES-1.25 @@ -3,10 +3,14 @@ turn it off. MediaWiki will not work with it enabled. == MediaWiki 1.25.2 == -THIS IS NOT YET A RELEASE! +This is a security and maintenance release of the MediaWiki 1.25 branch. === Changes since 1.25.1 === +* (T94116) SECURITY: Compare API watchlist token in constant time +* (T97391) SECURITY: Escape error message strings in thumb.php +* (T106893) SECURITY: Don't leak autoblocked IP addresses on + Special:DeletedContributions * (T102562) Fix InstantCommons parameters to handle the new HTTPS-only policy of Wikimedia Commons. * (T100767) Setting a configuration setting for skin or extension to diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 010c471c0af1..75ed529e3f17 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -75,7 +75,7 @@ $wgConfigRegistry = array( * MediaWiki version number * @since 1.2 */ -$wgVersion = '1.25.1'; +$wgVersion = '1.25.2'; /** * Name of the site. It must be changed in LocalSettings.php |