summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcsteipp <csteipp@wikimedia.org>2014-01-27 15:58:44 -0800
committerCSteipp <csteipp@wikimedia.org>2014-01-28 22:14:47 +0000
commitf0e7fa42015aed41b3b4399efbcf766bc5ed3f97 (patch)
tree323b3f8e3c4ad88da3ba48e094e0130dcdf1cb13
parent761fb9b36b91a72c47eb4ad1a5127c40de3a152d (diff)
Update Release Notes and Version number1.22.2
Change-Id: If71074f25a73c6c078a11b9ef453c27d0125ab42
-rw-r--r--RELEASE-NOTES-1.2210
-rw-r--r--includes/DefaultSettings.php2
2 files changed, 11 insertions, 1 deletions
diff --git a/RELEASE-NOTES-1.22 b/RELEASE-NOTES-1.22
index ff858e91e32c..ed64aa4dae75 100644
--- a/RELEASE-NOTES-1.22
+++ b/RELEASE-NOTES-1.22
@@ -3,6 +3,16 @@
Security reminder: MediaWiki does not require PHP's register_globals. If you
have it on, turn it '''off''' if you can.
+== MediaWiki 1.22.2 ==
+
+This is a security and bugfix release of the MediaWiki 1.22 branch.
+
+=== Changes since 1.22.1 ===
+
+* (bug 60339) SECURITY: Sanitize shell arguments to DjVu files, and other media formats
+* (bug 58253) Check for very old PCRE versions in installer and updater
+* (bug 60054) Make WikiPage::$mPreparedEdit public
+
== MediaWiki 1.22.1 ==
This is a security and maintenance release of the MediaWiki 1.22 branch.
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index f423e623c1fb..e9b4f490c910 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -63,7 +63,7 @@ $wgConf = new SiteConfiguration;
* MediaWiki version number
* @since 1.2
*/
-$wgVersion = '1.22.1';
+$wgVersion = '1.22.2';
/**
* Name of the site. It must be changed in LocalSettings.php