diff options
| author | Alex Monk <krenair@gmail.com> | 2013-04-15 23:28:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@wikimedia.org> | 2013-04-15 23:28:05 +0000 |
| commit | 9bf2924268672488a6ceaa9826e691f33d672e38 (patch) | |
| tree | 7915a094cc7785086a5c5e46ff03a56bd6c487fb | |
| parent | f9f3d0444fb160140ffe87188db969939659309b (diff) | |
| parent | 3758381ac9c9e1f737b2998b651aa01aae7d4060 (diff) | |
Merge "Updated release notes and version number" into REL1_201.20.4
| -rw-r--r-- | RELEASE-NOTES-1.20 | 8 | ||||
| -rw-r--r-- | includes/DefaultSettings.php | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/RELEASE-NOTES-1.20 b/RELEASE-NOTES-1.20 index a7197ec17dd8..d03ca1fa4afa 100644 --- a/RELEASE-NOTES-1.20 +++ b/RELEASE-NOTES-1.20 @@ -3,6 +3,14 @@ Security reminder: MediaWiki does not require PHP's register_globals setting since version 1.2.0. If you have it on, turn it '''off''' if you can. +== MediaWiki 1.20.4 == + +This is a security release of the MediaWiki 1.20 branch. + +=== Changes since 1.20.3 === +* (bug 47251) SECURITY: Disable external entities in Import +* (bug 46859) SECURITY: Disable external entities in XMLReader +* (bug 46084) SECURITY: Sanitize $limitReport before outputting == MediaWiki 1.20.3 == diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 426c11ade44b..ed566b3bd450 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.3'; +$wgVersion = '1.20.4'; /** Name of the site. It must be changed in LocalSettings.php */ $wgSitename = 'MediaWiki'; |