summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcsteipp <csteipp@wikimedia.org>2014-01-27 16:28:43 -0800
committercsteipp <csteipp@wikimedia.org>2014-01-28 13:39:15 -0800
commit98e2d46cb21399e3332a3a8849185af662e1f78f (patch)
tree2dd51e40ff2322db7f9f1b6cef87f120936c6403
parentf5c0a3775eec4354ea6e13bd1c2878a25e91484c (diff)
Update release notes and version number1.21.5
Change-Id: I7bb1d944c963dffdb29b96d0dbe64f9a905394f7
-rw-r--r--RELEASE-NOTES-1.218
-rw-r--r--includes/DefaultSettings.php2
2 files changed, 9 insertions, 1 deletions
diff --git a/RELEASE-NOTES-1.21 b/RELEASE-NOTES-1.21
index 12111aaa3e6a..35c54bfe5c16 100644
--- a/RELEASE-NOTES-1.21
+++ b/RELEASE-NOTES-1.21
@@ -3,6 +3,14 @@
Security reminder: MediaWiki does not require PHP's register_globals. If you
have it on, turn it '''off''' if you can.
+== MediaWiki 1.21.5 ==
+
+This is a security release of the MediaWiki 1.21 branch.
+
+=== Changes since 1.21.4 ===
+
+* (bug 60339) SECURITY: Sanitize shell arguments to DjVu files, and other media formats
+
== MediaWiki 1.21.4 ==
This is a security release of the MediaWiki 1.21 branch.
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index a6172f09d518..61f49dedddce 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.4';
+$wgVersion = '1.21.5';
/**
* Name of the site. It must be changed in LocalSettings.php