From 71c3ae0111c4aaa7facd32b73beb1f574146d855 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 9 May 2011 17:43:09 +0000 Subject: [PATCH] (bug 28864) Fix UtfNormal benchmark & test case runners from regression in r85327, r85944 It's possible that this has some side effect on HipHop builds -- the require_once on UtfNormalDefines.php that had been moved from UtfNormalUtil.php to MediaWiki's Setup.php in r85944 had been previously damaged by r85327 sticking a MediaWiki-specific MWInit class static method call into it, making it break on all the generator & test & benchmark code which does not depend on MediaWiki. With the require_once restored everything seems to work, though it's possible that it ends up trying to include twice on HipHop -- have not tested. --- includes/normal/UtfNormalUtil.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/includes/normal/UtfNormalUtil.php b/includes/normal/UtfNormalUtil.php index bfad709553..f2b12d4eed 100644 --- a/includes/normal/UtfNormalUtil.php +++ b/includes/normal/UtfNormalUtil.php @@ -25,6 +25,9 @@ * @ingroup UtfNormal */ +/** */ +require_once dirname(__FILE__).'/UtfNormalDefines.php'; + /** * Return UTF-8 sequence for a given Unicode code point. * May die if fed out of range data. -- 2.20.1