summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcsteipp <csteipp@wikimedia.org>2013-09-03 11:34:47 -0700
committerCSteipp <csteipp@wikimedia.org>2013-09-04 00:36:46 +0000
commit404e36aa5fdaccbebfc53d177304815069a0178c (patch)
tree110b456d0ac1ca429ffde8d8c9a3ef7c48c1674e
parent4f773f9c982ebe760e71827f928758407e53c72b (diff)
Updated release notes and version number1.21.2origin/REL1_21
Change-Id: Idc89da165e96377d65be7f4a67805f2bb17920cd
-rw-r--r--RELEASE-NOTES-1.2114
-rw-r--r--includes/DefaultSettings.php2
2 files changed, 8 insertions, 8 deletions
diff --git a/RELEASE-NOTES-1.21 b/RELEASE-NOTES-1.21
index df9503c37e51..4e08480f7b73 100644
--- a/RELEASE-NOTES-1.21
+++ b/RELEASE-NOTES-1.21
@@ -5,17 +5,17 @@ have it on, turn it '''off''' if you can.
== MediaWiki 1.21.2 ==
-This is a security release of the MediaWiki 1.21 branch.
+This is a security adn maintenance release of the MediaWiki 1.21 branch.
=== Changes since 1.21.1 ===
-* Support for the 'gettoken' parameter to action=block and action=unblock,
+* SECURITY: Fix extension detection with 2 .'s
+* SECURITY: Support for the 'gettoken' parameter to action=block and action=unblock,
deprecated since 1.20, has been removed.
-* (bug 49090) Token-getting functions will fail when using jsonp callbacks.
-* (bug 51064) Purge upstream caches when deleting file assets.
-* (bug 47750) Unit test suite now runs the AutoLoader tests. Also fixed the
- autoloading entry for the PageORMTableForTesting class though it had no
- impact.
+* SECURITY: Sanitize ResourceLoader exception messages
+* Purge upstream caches when deleting file assets.
+* Unit test suite now runs the AutoLoader tests. Also fixed the autoloading
+ entry for the PageORMTableForTesting class though it had no impact.
== MediaWiki 1.21.1 ==
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 9d024c86a759..0e493eb00ae6 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -63,7 +63,7 @@ $wgConf = new SiteConfiguration;
* MediaWiki version number
* @since 1.2
*/
-$wgVersion = '1.21.1';
+$wgVersion = '1.21.2';
/**
* Name of the site. It must be changed in LocalSettings.php