A few more ok -> done

diff --git a/includes/installer/DatabaseUpdater.php b/includes/installer/DatabaseUpdater.php
index 9fe0ce8..d8fdb48 100644 (file)
--- a/includes/installer/DatabaseUpdater.php
+++ b/includes/installer/DatabaseUpdater.php
@@ -453,7 +453,7 @@ abstract class DatabaseUpdater {
                } else {
                        $this->output( "Adding $index key to table $table... " );
                        $this->applyPatch( $patch, $fullpath );
-                       $this->output( "ok\n" );
+                       $this->output( "done.\n" );
                }
        }
 
@@ -469,7 +469,7 @@ abstract class DatabaseUpdater {
                if ( $this->db->fieldExists( $table, $field, __METHOD__ ) ) {
                        $this->output( "Table $table contains $field field. Dropping... " );
                        $this->applyPatch( $patch, $fullpath );
-                       $this->output( "ok\n" );
+                       $this->output( "done.\n" );
                } else {
                        $this->output( "...$table table does not contain $field field.\n" );
                }
@@ -487,7 +487,7 @@ abstract class DatabaseUpdater {
                if ( $this->db->indexExists( $table, $index, __METHOD__ ) ) {
                        $this->output( "Dropping $index key from table $table... " );
                        $this->applyPatch( $patch, $fullpath );
-                       $this->output( "ok\n" );
+                       $this->output( "done.\n" );
                } else {
                        $this->output( "...$index key doesn't exist.\n" );
                }
@@ -502,7 +502,7 @@ abstract class DatabaseUpdater {
                if ( $this->db->tableExists( $table, __METHOD__ ) ) {
                        $this->output( "Dropping table $table... " );
                        $this->applyPatch( $patch, $fullpath );
-                       $this->output( "ok\n" );
+                       $this->output( "done.\n" );
                } else {
                        $this->output( "...$table doesn't exist.\n" );
                }
@@ -528,7 +528,7 @@ abstract class DatabaseUpdater {
                        $this->output( "Modifying $field field of table $table..." );
                        $this->applyPatch( $patch, $fullpath );
                        $this->insertUpdateRow( $updateKey );
-                       $this->output( "ok\n" );
+                       $this->output( "done.\n" );
                }
        }
 

diff --git a/includes/installer/MysqlUpdater.php b/includes/installer/MysqlUpdater.php
index 8c417aa..707c3d0 100644 (file)
--- a/includes/installer/MysqlUpdater.php
+++ b/includes/installer/MysqlUpdater.php
@@ -563,11 +563,11 @@ class MysqlUpdater extends DatabaseUpdater {
                                $newug = $this->db->tableName( 'user_groups_bogus' );
                                $this->output( "user_groups table exists but is in bogus intermediate format. Renaming to $newug... " );
                                $this->db->query( "ALTER TABLE $oldug RENAME TO $newug", __METHOD__ );
-                               $this->output( "ok\n" );
+                               $this->output( "done.\n" );
 
                                $this->output( "Re-adding fresh user_groups table... " );
                                $this->applyPatch( 'patch-user_groups.sql' );
-                               $this->output( "ok\n" );
+                               $this->output( "done.\n" );
 
                                $this->output( "***\n" );
                                $this->output( "*** WARNING: You will need to manually fix up user permissions in the user_groups\n" );
@@ -587,7 +587,7 @@ class MysqlUpdater extends DatabaseUpdater {
                        if ( $this->db->fieldExists( 'user', 'user_rights', __METHOD__ ) ) {
                                $this->output( "Upgrading from a 1.3 or older database? Breaking out user_rights for conversion..." );
                                $this->db->applyPatch( 'patch-user_rights.sql' );
-                               $this->output( done.\n" );
+                               $this->output( "done.\n" );
                        } else {
                                $this->output( "*** WARNING: couldn't locate user_rights table or field for upgrade.\n" );
                                $this->output( "*** You may need to manually configure some sysops by manipulating\n" );