From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 24 Aug 2005 07:25:16 +0000 (+0000)
Subject: * Fix upgrade from 1.4 due to version number check breakage
X-Git-Tag: 1.6.0~1823
X-Git-Url: http://git.cyclocoop.org/%22%2C%20generer_url_ecrire%28?a=commitdiff_plain;h=30ba7dd9cdce97c9416a1d98f396d65d679ea1db;p=lhc%2Fweb%2Fwiklou.git

* Fix upgrade from 1.4 due to version number check breakage
* Fix upgrade from 1.4 with no old revisions
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index c460f6d0e1..1b23527415 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -50,6 +50,8 @@ Misc work going on.....
   to create or update pages.
 * Fix table prefix usage in Block::enumBlocks
 * (bug 3244) Fix remote image loading hack, JavaScript injection on MSIE
+* Fix upgrade from 1.4 due to version number check breakage [for rc future]
+* Fix upgrade from 1.4 with no old revisions
 
 
 === Caveats ===
diff --git a/maintenance/namespaceDupes.php b/maintenance/namespaceDupes.php
index ccbdd52d6c..35d325cf61 100644
--- a/maintenance/namespaceDupes.php
+++ b/maintenance/namespaceDupes.php
@@ -141,8 +141,7 @@ class NamespaceConflictChecker {
 	}
 	
 	function newSchema() {
-		global $wgVersion;
-		return version_compare( $wgVersion, '1.5alpha', 'ge' );
+		return class_exists( 'Revision' );
 	}
 }
 
diff --git a/maintenance/updaters.inc b/maintenance/updaters.inc
index 07bc251e2e..6ce2de629a 100644
--- a/maintenance/updaters.inc
+++ b/maintenance/updaters.inc
@@ -363,7 +363,7 @@ function do_schema_restructuring() {
 		echo "......Locking tables.\n";
 		$wgDatabase->query( "LOCK TABLES $page WRITE, $revision WRITE, $old WRITE, $cur WRITE", $fname );
 
-		$maxold = $wgDatabase->selectField( 'old', 'max(old_id)', '', $fname );
+		$maxold = intval( $wgDatabase->selectField( 'old', 'max(old_id)', '', $fname ) );
 		echo wfTimestamp();
 		echo "......maxold is {$maxold}\n";
 
diff --git a/maintenance/userDupes.inc b/maintenance/userDupes.inc
index db2487d0c4..c2fc6b1502 100644
--- a/maintenance/userDupes.inc
+++ b/maintenance/userDupes.inc
@@ -160,8 +160,7 @@ class UserDupes {
 	 * @access private
 	 */
 	function newSchema() {
-		global $wgVersion;
-		return version_compare( $wgVersion, '1.5alpha', 'ge' );
+		return class_exists( 'Revision' );
 	}
 	
 	/**