From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Thu, 20 Sep 2018 18:19:27 +0000 (+0000)
Subject: Merge "Use wfIsHHVM() instead of a HipHop-specific environment variable"
X-Git-Tag: 1.34.0-rc.0~4044
X-Git-Url: http://git.cyclocoop.org//%27http:/code.google.com/p/ie7-js//%27?a=commitdiff_plain;h=91698e974c6fdc6113af09bd7a6e7c7352778ba3;hp=62c6f40d73637c777a6bf14eaa4d1512e6663170;p=lhc%2Fweb%2Fwiklou.git

Merge "Use wfIsHHVM() instead of a HipHop-specific environment variable"
---

diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 7d5a362b38..dc2bb0c6b3 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -292,8 +292,8 @@ class Parser {
 			self::EXT_LINK_URL_CLASS . '*)\p{Zs}*([^\]\\x00-\\x08\\x0a-\\x1F\\x{FFFD}]*?)\]/Su';
 		if ( isset( $conf['preprocessorClass'] ) ) {
 			$this->mPreprocessorClass = $conf['preprocessorClass'];
-		} elseif ( defined( 'HPHP_VERSION' ) ) {
-			# Preprocessor_Hash is much faster than Preprocessor_DOM under HipHop
+		} elseif ( wfIsHHVM() ) {
+			# Under HHVM Preprocessor_Hash is much faster than Preprocessor_DOM
 			$this->mPreprocessorClass = Preprocessor_Hash::class;
 		} elseif ( extension_loaded( 'domxml' ) ) {
 			# PECL extension that conflicts with the core DOM extension (T15770)