From: Brion Vibber <brion@users.mediawiki.org>
Date: Sat, 25 Jun 2005 22:42:48 +0000 (+0000)
Subject: fix tyops and breakage
X-Git-Tag: 1.5.0beta1~19
X-Git-Url: http://git.cyclocoop.org/%28%5B%5E//%22%22?a=commitdiff_plain;h=9fa1aee30bf201b02ea6c3677bbc650969658c3b;p=lhc%2Fweb%2Fwiklou.git

fix tyops and breakage
---

diff --git a/maintenance/upgrade1_5.php b/maintenance/upgrade1_5.php
index 1637469252..fdfc8b3c1f 100644
--- a/maintenance/upgrade1_5.php
+++ b/maintenance/upgrade1_5.php
@@ -352,6 +352,7 @@ class FiveUpgrade {
 		$this->dbw->query("CREATE TABLE $revision (
   			rev_id int(8) unsigned NOT NULL auto_increment,
   			rev_page int(8) unsigned NOT NULL,
+  			rev_text_id int(8) unsigned NOT NULL,
   			rev_comment tinyblob NOT NULL default '',
   			rev_user int(5) unsigned NOT NULL default '0',
   			rev_user_text varchar(255) binary NOT NULL default '',
@@ -438,6 +439,7 @@ class FiveUpgrade {
 			$add[] = array(
 				'rev_id'         =>              $row->old_id,
 				'rev_page'       =>              $row->cur_id,
+				'rev_text_id'    =>              $row->old_id,
 				'rev_comment'    => $this->conv( $row->old_comment ),
 				'rev_user'       =>              $row->old_user,
 				'rev_user_text'  => $this->conv( $row->old_user_text ),
@@ -943,7 +945,7 @@ END;
 			'log_title'     => MW_UPGRADE_ENCODE,
 			'log_comment'   => MW_UPGRADE_ENCODE,
 			'log_params'    => MW_UPGRADE_ENCODE );
-		$this->copyTable( 'archive', $tabledef, $fields );
+		$this->copyTable( 'logging', $tabledef, $fields );
 	}
 
 	function upgradeArchive() {
@@ -1143,7 +1145,7 @@ END;
 	}
 	
 	function renameTable( $from, $to ) {
-		$this->log( 'Renaming $from to $to...' );
+		$this->log( "Renaming $from to $to..." );
 
 		$fromtable = $this->dbw->tableName( $from );
 		$totable   = $this->dbw->tableName( $to );