summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcsteipp <csteipp@wikimedia.org>2012-11-27 18:37:27 -0800
committercsteipp <csteipp@wikimedia.org>2012-11-29 18:06:37 -0800
commit7e508a3b9bfc532a0b4a1bd780c61f69ff4ccbda (patch)
tree9138849bc648e7cd6a9cc66657466de13a850a13
parent663bf85d8663b1ae7e38655c6340df3b47d3eb96 (diff)
Update release notes and incremented versionorigin/REL1_18
Change-Id: I8d2cdba86fc7e237b14aae94eef0681578016b78
-rw-r--r--RELEASE-NOTES-1.1812
-rw-r--r--includes/DefaultSettings.php2
2 files changed, 13 insertions, 1 deletions
diff --git a/RELEASE-NOTES-1.18 b/RELEASE-NOTES-1.18
index b962c7f56c8a..d8b6e77b37a6 100644
--- a/RELEASE-NOTES-1.18
+++ b/RELEASE-NOTES-1.18
@@ -3,6 +3,18 @@
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.6 ==
+2012-11-28
+
+This is a maintenance and security release of the MediaWiki 1.18 branch
+
+=== Changes since 1.18.5 ===
+* (bug 40995) Prevent session fixation in Special:UserLogin (CVE-2012-5391)
+* (bug 41400) Prevent linker regex from exceeding PCRE backtrack limit
+* Localisation updates
+* Increase permitted runtime for testParserTest
+* (bug 36179) Unquote 'null' for PostgreSQL.
+
== MediaWiki 1.18.5 ==
2012-08-30
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index d473f8533ccd..4babd4308bfc 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -33,7 +33,7 @@ $wgConf = new SiteConfiguration;
/** @endcond */
/** MediaWiki version number */
-$wgVersion = '1.18.5';
+$wgVersion = '1.18.6';
/** Name of the site. It must be changed in LocalSettings.php */
$wgSitename = 'MediaWiki';