Merge "Fix patchfile used to add newtalk table on mysql"

diff --combined includes/installer/MysqlUpdater.php
index 556d0d5,c63c59c..a9d02da
--- 1/includes/installer/MysqlUpdater.php
--- 2/includes/installer/MysqlUpdater.php
+++ b/includes/installer/MysqlUpdater.php
@@@ -83,7 -83,7 +83,7 @@@ class MysqlUpdater extends DatabaseUpda
                        [ 'doUserUniqueUpdate' ],
                        [ 'doUserGroupsUpdate' ],
                        [ 'addField', 'site_stats', 'ss_total_pages', 'patch-ss_total_articles.sql' ],
-                       [ 'addTable', 'user_newtalk', 'patch-usernewtalk2.sql' ],
+                       [ 'addTable', 'user_newtalk', 'patch-usernewtalk.sql' ],
                        [ 'addTable', 'transcache', 'patch-transcache.sql' ],
                        [ 'addField', 'interwiki', 'iw_trans', 'patch-interwiki-trans.sql' ],
  
@@@ -267,7 -267,7 +267,7 @@@
  
                        // 1.25
                        // note this patch covers other _comment and _description fields too
 -                      [ 'modifyField', 'recentchanges', 'rc_comment', 'patch-editsummary-length.sql' ],
 +                      [ 'doExtendCommentLengths' ],
  
                        // 1.26
                        [ 'dropTable', 'hitcounter' ],
@@@ -390,7 -390,7 +390,7 @@@
                global $IP;
  
                if ( !$this->doTable( 'interwiki' ) ) {
 -                      return true;
 +                      return;
                }
  
                if ( $this->db->tableExists( "interwiki", __METHOD__ ) ) {
@@@ -1181,22 -1181,6 +1181,22 @@@
                );
        }
  
 +      protected function doExtendCommentLengths() {
 +              $table = $this->db->tableName( 'revision' );
 +              $res = $this->db->query( "SHOW COLUMNS FROM $table LIKE 'rev_comment'" );
 +              $row = $this->db->fetchObject( $res );
 +
 +              if ( $row && ( $row->Type !== "varbinary(767)" || $row->Default !== "" ) ) {
 +                      $this->applyPatch(
 +                              'patch-editsummary-length.sql',
 +                              false,
 +                              'Extending edit summary lengths (and setting defaults)'
 +                      );
 +              } else {
 +                      $this->output( '...comment fields are up to date' );
 +              }
 +      }
 +
        public function getSchemaVars() {
                global $wgDBTableOptions;