From: Aaron Schulz <aschulz@wikimedia.org>
Date: Wed, 10 Dec 2014 19:04:56 +0000 (-0800)
Subject: Fixed internalClean class/method existence check for HHVM
X-Git-Tag: 1.31.0-rc.0~13012
X-Git-Url: http://git.cyclocoop.org/%22.%24h.%22?a=commitdiff_plain;h=6a1d9c8ddcccb28e498bf6dab376c40279e6b925;p=lhc%2Fweb%2Fwiklou.git

Fixed internalClean class/method existence check for HHVM

* Follows up 4f281083fda91879a77fb87d64d8a9533526bd0c

Change-Id: I5fa406ed1c4f2eefd1c22e9ab90e72655f31d162
---

diff --git a/includes/parser/MWTidy.php b/includes/parser/MWTidy.php
index 8ec324ccba..7b537768a1 100644
--- a/includes/parser/MWTidy.php
+++ b/includes/parser/MWTidy.php
@@ -246,8 +246,8 @@ class MWTidy {
 		global $wgTidyConf, $wgDebugTidy;
 		wfProfileIn( __METHOD__ );
 
-		if ( !class_exists( 'tidy' ) ||
-			( wfIsHHVM() && !function_exists('tidy_repair_string') )
+		if ( ( !wfIsHHVM() && !class_exists( 'tidy' ) ) ||
+			( wfIsHHVM() && !function_exists( 'tidy_repair_string' ) )
 		) {
 			wfWarn( "Unable to load internal tidy class." );
 			$retval = -1;