| Index: trunk/phase3/includes/installer/DatabaseUpdater.php |
| — | — | @@ -453,7 +453,7 @@ |
| 454 | 454 | } else { |
| 455 | 455 | $this->output( "Adding $index key to table $table... " ); |
| 456 | 456 | $this->applyPatch( $patch, $fullpath ); |
| 457 | | - $this->output( "ok\n" ); |
| | 457 | + $this->output( "done.\n" ); |
| 458 | 458 | } |
| 459 | 459 | } |
| 460 | 460 | |
| — | — | @@ -469,7 +469,7 @@ |
| 470 | 470 | if ( $this->db->fieldExists( $table, $field, __METHOD__ ) ) { |
| 471 | 471 | $this->output( "Table $table contains $field field. Dropping... " ); |
| 472 | 472 | $this->applyPatch( $patch, $fullpath ); |
| 473 | | - $this->output( "ok\n" ); |
| | 473 | + $this->output( "done.\n" ); |
| 474 | 474 | } else { |
| 475 | 475 | $this->output( "...$table table does not contain $field field.\n" ); |
| 476 | 476 | } |
| — | — | @@ -487,7 +487,7 @@ |
| 488 | 488 | if ( $this->db->indexExists( $table, $index, __METHOD__ ) ) { |
| 489 | 489 | $this->output( "Dropping $index key from table $table... " ); |
| 490 | 490 | $this->applyPatch( $patch, $fullpath ); |
| 491 | | - $this->output( "ok\n" ); |
| | 491 | + $this->output( "done.\n" ); |
| 492 | 492 | } else { |
| 493 | 493 | $this->output( "...$index key doesn't exist.\n" ); |
| 494 | 494 | } |
| — | — | @@ -502,7 +502,7 @@ |
| 503 | 503 | if ( $this->db->tableExists( $table, __METHOD__ ) ) { |
| 504 | 504 | $this->output( "Dropping table $table... " ); |
| 505 | 505 | $this->applyPatch( $patch, $fullpath ); |
| 506 | | - $this->output( "ok\n" ); |
| | 506 | + $this->output( "done.\n" ); |
| 507 | 507 | } else { |
| 508 | 508 | $this->output( "...$table doesn't exist.\n" ); |
| 509 | 509 | } |
| — | — | @@ -528,7 +528,7 @@ |
| 529 | 529 | $this->output( "Modifying $field field of table $table..." ); |
| 530 | 530 | $this->applyPatch( $patch, $fullpath ); |
| 531 | 531 | $this->insertUpdateRow( $updateKey ); |
| 532 | | - $this->output( "ok\n" ); |
| | 532 | + $this->output( "done.\n" ); |
| 533 | 533 | } |
| 534 | 534 | } |
| 535 | 535 | |
| Index: trunk/phase3/includes/installer/MysqlUpdater.php |
| — | — | @@ -563,11 +563,11 @@ |
| 564 | 564 | $newug = $this->db->tableName( 'user_groups_bogus' ); |
| 565 | 565 | $this->output( "user_groups table exists but is in bogus intermediate format. Renaming to $newug... " ); |
| 566 | 566 | $this->db->query( "ALTER TABLE $oldug RENAME TO $newug", __METHOD__ ); |
| 567 | | - $this->output( "ok\n" ); |
| | 567 | + $this->output( "done.\n" ); |
| 568 | 568 | |
| 569 | 569 | $this->output( "Re-adding fresh user_groups table... " ); |
| 570 | 570 | $this->applyPatch( 'patch-user_groups.sql' ); |
| 571 | | - $this->output( "ok\n" ); |
| | 571 | + $this->output( "done.\n" ); |
| 572 | 572 | |
| 573 | 573 | $this->output( "***\n" ); |
| 574 | 574 | $this->output( "*** WARNING: You will need to manually fix up user permissions in the user_groups\n" ); |
| — | — | @@ -587,7 +587,7 @@ |
| 588 | 588 | if ( $this->db->fieldExists( 'user', 'user_rights', __METHOD__ ) ) { |
| 589 | 589 | $this->output( "Upgrading from a 1.3 or older database? Breaking out user_rights for conversion..." ); |
| 590 | 590 | $this->db->applyPatch( 'patch-user_rights.sql' ); |
| 591 | | - $this->output( done.\n" ); |
| | 591 | + $this->output( "done.\n" ); |
| 592 | 592 | } else { |
| 593 | 593 | $this->output( "*** WARNING: couldn't locate user_rights table or field for upgrade.\n" ); |
| 594 | 594 | $this->output( "*** You may need to manually configure some sysops by manipulating\n" ); |