Bump release to 1.4.21.4.2

2 files changed, 15 insertions, 8 deletions

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index d295a36babb8..82914b8d9e01 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -4,16 +4,23 @@ 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.4.1 ==
+== MediaWiki 1.4.2 ==
 
-(released 2005-04-17)
+(released 2005-04-20)
 
-MediaWiki 1.4.1 is a bug fix release for the 1.4 stable release series.
-All new installations are highly recommended to use 1.4.1 instead of 1.3.x;
-1.3.x users should consider upgrading for bug fixes and new features.
+MediaWiki 1.4.2 is a security and bug fix release for the 1.4 stable release
+series.
 
-1.4.0 and 1.4 beta or release candidate users should upgrade to this release
-for relevant bug fixes; see the changelog later in this file.
+A cross-site scripting injection vulnerability was discovered, which
+affects only MSIE clients and is only open if MediaWiki has been
+manually configured to run output through HTML Tidy ($wgUseTidy).
+
+Several other bugs are fixed in this release, see the changelog below.
+
+All new installations are highly recommended to use 1.4.2 instead of
+1.3.x; 1.3.x users should consider upgrading for bug fixes and new
+features. Ealier 1.4.x release and beta users should upgrade to this
+release for relevant bug fixes; see the changelog later in this file.
 
 
 If you have trouble, remember to read this whole file and the online FAQ page
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index f277e304e891..04dd0c90208a 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -19,7 +19,7 @@ if( defined( 'MEDIAWIKI' ) ) {
  * MediaWiki version number
  * @global string $wgVersion
  */
-$wgVersion			= '1.4.1';
+$wgVersion			= '1.4.2';
 
 /** 
  * Name of the site.