From: Chad Horohoe <chadh@wikimedia.org>
Date: Wed, 18 Mar 2015 23:38:01 +0000 (-0700)
Subject: Remove EditFilterMerged detection define
X-Git-Tag: 1.31.0-rc.0~12043^2
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/%7B%7B%20url_for%28%27vote%27%2C%20idvote=vote.voteid%29%20%7D%7D?a=commitdiff_plain;h=717473d8348085dd694f544898115a6630b09f41;p=lhc%2Fweb%2Fwiklou.git

Remove EditFilterMerged detection define

We've supported this hook since 1.12 days and it's actually
deprecated by EditFilterMergedContent. No extensions in Git
or SVN check for this define anymore.

Change-Id: If638094a2fb2f047a3b40a24e11e2c0e2fa9c1b9
---

diff --git a/includes/Defines.php b/includes/Defines.php
index 8456c5dd6a..432cf7fbbc 100644
--- a/includes/Defines.php
+++ b/includes/Defines.php
@@ -208,7 +208,6 @@ require_once __DIR__ . '/libs/normal/UtfNormalDefines.php';
 /**@{
  * Hook support constants
  */
-define( 'MW_SUPPORTS_EDITFILTERMERGED', 1 );
 define( 'MW_SUPPORTS_PARSERFIRSTCALLINIT', 1 );
 define( 'MW_SUPPORTS_LOCALISATIONCACHE', 1 );
 define( 'MW_SUPPORTS_CONTENTHANDLER', 1 );