From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 24 Nov 2015 18:53:43 +0000 (+0000)
Subject: Merge "Add script to fix content model of JSON pages"
X-Git-Tag: 1.31.0-rc.0~8891
X-Git-Url: http://git.cyclocoop.org/?a=commitdiff_plain;h=899bd46cbb1695a1e5fbce81839dbc7a352ceeb1;p=lhc%2Fweb%2Fwiklou.git

Merge "Add script to fix content model of JSON pages"
---

899bd46cbb1695a1e5fbce81839dbc7a352ceeb1
diff --cc autoload.php
index 3596ac360f,80d1eebfd8..03748bf895
--- a/autoload.php
+++ b/autoload.php
@@@ -443,8 -446,8 +443,9 @@@ $wgAutoloadLocalClasses = array
  	'FileRepoStatus' => __DIR__ . '/includes/filerepo/FileRepoStatus.php',
  	'FindHooks' => __DIR__ . '/maintenance/findHooks.php',
  	'FindMissingFiles' => __DIR__ . '/maintenance/findMissingFiles.php',
 +	'FindOrphanedFiles' => __DIR__ . '/maintenance/findOrphanedFiles.php',
  	'FixBug20757' => __DIR__ . '/maintenance/storage/fixBug20757.php',
+ 	'FixDefaultJsonContentPages' => __DIR__ . '/maintenance/fixDefaultJsonContentPages.php',
  	'FixDoubleRedirects' => __DIR__ . '/maintenance/fixDoubleRedirects.php',
  	'FixExtLinksProtocolRelative' => __DIR__ . '/maintenance/fixExtLinksProtocolRelative.php',
  	'FixTimestamps' => __DIR__ . '/maintenance/fixTimestamps.php',