Bump to beta4; disable compressOld as it's known to break.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 8b1df21..6e6c492 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -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.5 beta 4 ==
+
+July 30, 2005
+
+MediaWiki 1.5 beta 4 is a preview release of the new 1.5 release series.
+A number of bugs have been fixed since beta 3; see the full changelist below.
+
+
 == MediaWiki 1.5 beta 3 ==
 
 July 7, 2005
@@ -617,6 +625,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 2676) Apply a protective transformation on editing input/output
   for browsers that hit the Unicode blacklist. Patch by plugwash.
 * (bug 2999) Fix encoding conversion of pl_title in upgrade1_5.php
+* compressOld.php disabled, as it's known to be broken.
 
 
 === Caveats ===

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 9121bb0..7690ddc 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -28,7 +28,7 @@ require_once( 'includes/SiteConfiguration.php' );
 $wgConf = new SiteConfiguration;
 
 /** MediaWiki version number */
-$wgVersion                     = '1.5beta3';
+$wgVersion                     = '1.5beta4';
 
 /** Name of the site. It must be changed in LocalSettings.php */
 $wgSitename         = 'MediaWiki';

diff --git a/maintenance/compressOld.php b/maintenance/compressOld.php
index 865fceb..0d449c4 100644 (file)
--- a/maintenance/compressOld.php
+++ b/maintenance/compressOld.php
@@ -32,7 +32,9 @@
  *    <factor-threshold> is a minimum number of KB, where <max-factor> cuts in
  *
  */
- 
+
+die( 'compressOld is known to be broken at the moment.' );
+
 $optionsWithArgs = array( 't', 'c', 's', 'f', 'h' );
 require_once( "commandLine.inc" );
 require_once( "compressOld.inc" );