From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 11 Sep 2018 13:59:46 +0000 (+0000)
Subject: Merge "[MCR] Set MCR migration stage to write-both/read-new."
X-Git-Tag: 1.34.0-rc.0~4132
X-Git-Url: http://git.cyclocoop.org//%27http:/ie7-js.googlecode.com/svn/test/index.html/%27?a=commitdiff_plain;h=388524219c5d86a6869146d2a40abaa811cff55f;hp=-c;p=lhc%2Fweb%2Fwiklou.git

Merge "[MCR] Set MCR migration stage to write-both/read-new."
---

388524219c5d86a6869146d2a40abaa811cff55f
diff --combined includes/DefaultSettings.php
index 702ea54f6a,29405b597e..343e80d6f5
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@@ -7359,7 -7359,7 +7359,7 @@@ $wgExtensionMessagesFiles = []
   * @code
   *    $wgMessagesDirs['Example'] = [
   *        __DIR__ . '/lib/ve/i18n',
 - *        __DIR__ . '/lib/oojs-ui/i18n',
 + *        __DIR__ . '/lib/ooui/i18n',
   *        __DIR__ . '/i18n',
   *    ]
   * @endcode
@@@ -8998,7 -8998,7 +8998,7 @@@ $wgCommentTableSchemaMigrationStage = M
   * @since 1.32
   * @var int An appropriate combination of SCHEMA_COMPAT_XXX flags.
   */
- $wgMultiContentRevisionSchemaMigrationStage = SCHEMA_COMPAT_WRITE_BOTH | SCHEMA_COMPAT_READ_OLD;
+ $wgMultiContentRevisionSchemaMigrationStage = SCHEMA_COMPAT_WRITE_BOTH | SCHEMA_COMPAT_READ_NEW;
  
  /**
   * Actor table schema migration stage.