summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcsteipp <csteipp@wikimedia.org>2012-08-31 07:22:13 -0700
committercsteipp <csteipp@wikimedia.org>2012-08-31 07:22:13 -0700
commit0af5bb7d42a64915a8c7014bf8c88ed192857e57 (patch)
tree513c8bc8b607cb25d0a945541c37b6c5a3c9b2c9
parent2d3d6acbb1c63ff9fbe1e8b354c3c6daa5e02be0 (diff)
Update release notes and incremented version1.18.5
Change-Id: I983b436b58fd753e3d3bb582a04492df1a9fe2df
-rw-r--r--RELEASE-NOTES-1.1813
-rw-r--r--includes/DefaultSettings.php2
2 files changed, 14 insertions, 1 deletions
diff --git a/RELEASE-NOTES-1.18 b/RELEASE-NOTES-1.18
index 2c151fd0a7e7..b592b570624b 100644
--- a/RELEASE-NOTES-1.18
+++ b/RELEASE-NOTES-1.18
@@ -3,6 +3,19 @@
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.18.5 ==
+2012-08-30
+
+This is a security release of the MediaWiki 1.18 branch
+
+=== Changes since 1.18.4 ===
+* (bug 39700) File: link to non-existing file can inject html
+* (bug 39823) Hidden block text leaking to admins
+* (bug 39184) LDAP password leakage
+* (bug 39180) Disallow framing of api results
+* (bug 37587) Enforce language codes to be html safe
+* (bug 39824) Check global blocks on account creation
+
== MediaWiki 1.18.4 ==
2012-06-12
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 81029a63c51b..d473f8533ccd 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -33,7 +33,7 @@ $wgConf = new SiteConfiguration;
/** @endcond */
/** MediaWiki version number */
-$wgVersion = '1.18.4';
+$wgVersion = '1.18.5';
/** Name of the site. It must be changed in LocalSettings.php */
$wgSitename = 'MediaWiki';