summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReedy <reedy@wikimedia.org>2012-04-25 19:13:01 +0100
committerReedy <reedy@wikimedia.org>2012-04-25 19:13:01 +0100
commitbd24d69d6fb35e7a2367a53e3ccd4d16e592ea87 (patch)
tree9830d01919de08affab876cf19f56ead6f957073
parent87bf944bbca521e2219e0dffc187e497bddd7082 (diff)
Bump 1.17.41.17.4
Add a few bits to the RELEASE-NOTES Change-Id: Iaf07d38712b342160442150db2b4334a1dfce04d
-rw-r--r--RELEASE-NOTES9
-rw-r--r--includes/DefaultSettings.php2
2 files changed, 7 insertions, 4 deletions
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 86310a26be25..05c00206376f 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -3,10 +3,10 @@
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.17.3 ==
-2012-03-21
+== MediaWiki 1.17.4 ==
+2012-04-25
-This a maintenance and security release of the MediaWiki 1.17 branch.
+This a maintenance of the MediaWiki 1.17 branch.
=== Summary of selected changes in 1.17 ===
@@ -38,6 +38,9 @@ Selected changes since MediaWiki 1.16 that may be of interest:
=== Changes since 1.17.3 ===
* (bug 35961) Hash comparison should always be strict.
+* Fix broken email confirmation expiration caused by MWCryptRand changes.
+* (bug 35671) PHP Notice: Undefined index: gettoken in includes/api/ApiMain.php
+ on line 598.
=== Changes since 1.17.2 ===
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 92fcc16b6ea1..f9b1c0073f5e 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -34,7 +34,7 @@ if ( !defined( 'MW_PHP4' ) ) {
/** @endcond */
/** MediaWiki version number */
-$wgVersion = '1.17.3';
+$wgVersion = '1.17.4';
/** Name of the site. It must be changed in LocalSettings.php */
$wgSitename = 'MediaWiki';