summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcsteipp <csteipp@wikimedia.org>2013-05-21 09:37:12 -0700
committercsteipp <csteipp@wikimedia.org>2013-05-21 13:22:47 -0700
commitddc3327ba00be2cd4bc9e72cbc18ddbfb96bdc71 (patch)
treed864b6d273445eb00754d59cc6fa103751bbbe72
parent14cf1bb8b76e1016f30afa438942d49e3033ed11 (diff)
Updated release notes and version number1.20.6
Change-Id: I630010e6371ac4ba9ea24e5f2f48e891d3e41c2f
-rw-r--r--RELEASE-NOTES-1.207
-rw-r--r--includes/DefaultSettings.php2
2 files changed, 6 insertions, 3 deletions
diff --git a/RELEASE-NOTES-1.20 b/RELEASE-NOTES-1.20
index 2da9e3555521..d4f399a06b01 100644
--- a/RELEASE-NOTES-1.20
+++ b/RELEASE-NOTES-1.20
@@ -6,11 +6,14 @@ setting since version 1.2.0. If you have it on, turn it '''off''' if you can.
== MediaWiki 1.20.6 ==
-This is a maintenance release of the MediaWiki 1.20 branch.
+This is a security and maintenance release of the MediaWiki 1.20 branch.
=== Changes since 1.20.5 ===
+* (bug 48306) SECURITY: Run file validation checks on chunked uploads, and chunks
+ of upload, during the upload process.
+* (bug 44327) mediawiki.user: Use session ID instead of 1-year cross-session cookies
* (bug 47202) wikibits: FF2Fixes.css should not be loaded in Firefox 20.
-
+* (bug 31044) Make ResourceLoader behave in read-only mode
== MediaWiki 1.20.5 ==
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 6abc2b10daed..710605adb57f 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -59,7 +59,7 @@ if( !defined( 'MEDIAWIKI' ) ) {
$wgConf = new SiteConfiguration;
/** MediaWiki version number */
-$wgVersion = '1.20.5';
+$wgVersion = '1.20.6';
/** Name of the site. It must be changed in LocalSettings.php */
$wgSitename = 'MediaWiki';