summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcsteipp <csteipp@wikimedia.org>2013-09-03 09:07:11 -0700
committerCSteipp <csteipp@wikimedia.org>2013-09-04 03:56:44 +0000
commit7b9549088534ac636d131e054631adb16b39bd1e (patch)
tree07af0daea3e08ea6bcc8397a17525995dc8a4bda
parentabac6e687f408bb2fbf89e07880fe7720709b8b7 (diff)
Update release notes and version1.20.7
Change-Id: I3a2f166a05d5acef8b065de2cd1a609914d7999f
-rw-r--r--RELEASE-NOTES-1.2012
-rw-r--r--includes/DefaultSettings.php2
2 files changed, 5 insertions, 9 deletions
diff --git a/RELEASE-NOTES-1.20 b/RELEASE-NOTES-1.20
index efddc1c0c64f..e1ca82781044 100644
--- a/RELEASE-NOTES-1.20
+++ b/RELEASE-NOTES-1.20
@@ -5,17 +5,13 @@ setting since version 1.2.0. If you have it on, turn it '''off''' if you can.
== MediaWiki 1.20.7 ==
-This is not yet a release!
-
-=== Changes since 1.20.6 ===
-* (bug 51064) Purge upstream caches when deleting file assets.
-
-== MediaWiki 1.20.7 ==
-
This is a security release of the MediaWiki 1.20 branch.
=== Changes since 1.20.6 ===
-* (bug 49090) Token-getting functions will fail when using jsonp callbacks.
+* SECURITY: Fix extension detection with 2 .'s
+* SECURITY: Token-getting functions will fail when using jsonp callbacks.
+* SECURITY: Sanitize ResourceLoader exception messages
+* Purge upstream caches when deleting file assets.
== MediaWiki 1.20.6 ==
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 710605adb57f..ae98f6914345 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.6';
+$wgVersion = '1.20.7';
/** Name of the site. It must be changed in LocalSettings.php */
$wgSitename = 'MediaWiki';