http://www.mediawiki.org/wiki/Special:Code/MediaWiki/88177
Revision: 88177
Author: tstarling
Date: 2011-05-15 13:36:59 +0000 (Sun, 15 May 2011)
Log Message:
-----------
Fix for HipHop breakage in r87748 etc. Please do not use
require_once(dirname(__FILE__)...) to fetch class, function or define()
dependencies anymore. You do not need to have HipHop to know that doing so will
break it.
Modified Paths:
--------------
trunk/phase3/includes/GlobalFunctions.php
trunk/phase3/includes/Setup.php
trunk/phase3/includes/normal/Utf8CaseGenerate.php
trunk/phase3/includes/normal/Utf8Test.php
trunk/phase3/includes/normal/UtfNormal.php
trunk/phase3/includes/normal/UtfNormalBench.php
trunk/phase3/includes/normal/UtfNormalGenerate.php
trunk/phase3/includes/normal/UtfNormalMemStress.php
trunk/phase3/includes/normal/UtfNormalTest.php
trunk/phase3/includes/normal/UtfNormalUtil.php
Modified: trunk/phase3/includes/GlobalFunctions.php
===================================================================
--- trunk/phase3/includes/GlobalFunctions.php 2011-05-15 13:21:16 UTC (rev
88176)
+++ trunk/phase3/includes/GlobalFunctions.php 2011-05-15 13:36:59 UTC (rev
88177)
@@ -8,10 +8,6 @@
die( "This file is part of MediaWiki, it is not a valid entry point" );
}
-if ( !defined( 'MW_COMPILED' ) ) {
- require_once( dirname( __FILE__ ) . '/normal/UtfNormalUtil.php' );
-}
-
// Hide compatibility functions from Doxygen
/// @cond
Modified: trunk/phase3/includes/Setup.php
===================================================================
--- trunk/phase3/includes/Setup.php 2011-05-15 13:21:16 UTC (rev 88176)
+++ trunk/phase3/includes/Setup.php 2011-05-15 13:36:59 UTC (rev 88177)
@@ -326,6 +326,7 @@
wfProfileOut( $fname . '-exception' );
wfProfileIn( $fname . '-includes' );
+ require_once( "$IP/includes/normal/UtfNormalUtil.php" );
require_once( "$IP/includes/GlobalFunctions.php" );
require_once( "$IP/includes/Hooks.php" );
require_once( "$IP/includes/ProxyTools.php" );
Modified: trunk/phase3/includes/normal/Utf8CaseGenerate.php
===================================================================
--- trunk/phase3/includes/normal/Utf8CaseGenerate.php 2011-05-15 13:21:16 UTC
(rev 88176)
+++ trunk/phase3/includes/normal/Utf8CaseGenerate.php 2011-05-15 13:36:59 UTC
(rev 88177)
@@ -29,6 +29,7 @@
die( "Run me from the command line please.\n" );
}
+require_once 'UtfNormalDefines.php';
require_once 'UtfNormalUtil.php';
$in = fopen("UnicodeData.txt", "rt" );
Modified: trunk/phase3/includes/normal/Utf8Test.php
===================================================================
--- trunk/phase3/includes/normal/Utf8Test.php 2011-05-15 13:21:16 UTC (rev
88176)
+++ trunk/phase3/includes/normal/Utf8Test.php 2011-05-15 13:36:59 UTC (rev
88177)
@@ -26,6 +26,8 @@
*/
/** */
+
+require_once 'UtfNormalDefines.php';
require_once 'UtfNormalUtil.php';
require_once 'UtfNormal.php';
mb_internal_encoding( "utf-8" );
Modified: trunk/phase3/includes/normal/UtfNormal.php
===================================================================
--- trunk/phase3/includes/normal/UtfNormal.php 2011-05-15 13:21:16 UTC (rev
88176)
+++ trunk/phase3/includes/normal/UtfNormal.php 2011-05-15 13:36:59 UTC (rev
88177)
@@ -28,8 +28,6 @@
* @defgroup UtfNormal UtfNormal
*/
-require_once dirname(__FILE__).'/UtfNormalUtil.php';
-
/**
* For using the ICU wrapper
*/
Modified: trunk/phase3/includes/normal/UtfNormalBench.php
===================================================================
--- trunk/phase3/includes/normal/UtfNormalBench.php 2011-05-15 13:21:16 UTC
(rev 88176)
+++ trunk/phase3/includes/normal/UtfNormalBench.php 2011-05-15 13:36:59 UTC
(rev 88177)
@@ -28,6 +28,7 @@
dl( 'php_utfnormal.so' );
}
+require_once 'UtfNormalDefines.php';
require_once 'UtfNormalUtil.php';
require_once 'UtfNormal.php';
Modified: trunk/phase3/includes/normal/UtfNormalGenerate.php
===================================================================
--- trunk/phase3/includes/normal/UtfNormalGenerate.php 2011-05-15 13:21:16 UTC
(rev 88176)
+++ trunk/phase3/includes/normal/UtfNormalGenerate.php 2011-05-15 13:36:59 UTC
(rev 88177)
@@ -29,6 +29,7 @@
die( "Run me from the command line please.\n" );
}
+require_once 'UtfNormalDefines.php';
require_once 'UtfNormalUtil.php';
$in = fopen("DerivedNormalizationProps.txt", "rt" );
Modified: trunk/phase3/includes/normal/UtfNormalMemStress.php
===================================================================
--- trunk/phase3/includes/normal/UtfNormalMemStress.php 2011-05-15 13:21:16 UTC
(rev 88176)
+++ trunk/phase3/includes/normal/UtfNormalMemStress.php 2011-05-15 13:36:59 UTC
(rev 88177)
@@ -30,6 +30,7 @@
dl( 'php_utfnormal.so' );
}
+require_once 'UtfNormalDefines.php';
require_once 'UtfNormalUtil.php';
require_once 'UtfNormal.php';
Modified: trunk/phase3/includes/normal/UtfNormalTest.php
===================================================================
--- trunk/phase3/includes/normal/UtfNormalTest.php 2011-05-15 13:21:16 UTC
(rev 88176)
+++ trunk/phase3/includes/normal/UtfNormalTest.php 2011-05-15 13:36:59 UTC
(rev 88177)
@@ -49,6 +49,7 @@
dl( 'php_utfnormal.so' );
}
+require_once 'UtfNormalDefines.php';
require_once 'UtfNormalUtil.php';
require_once 'UtfNormal.php';
Modified: trunk/phase3/includes/normal/UtfNormalUtil.php
===================================================================
--- trunk/phase3/includes/normal/UtfNormalUtil.php 2011-05-15 13:21:16 UTC
(rev 88176)
+++ trunk/phase3/includes/normal/UtfNormalUtil.php 2011-05-15 13:36:59 UTC
(rev 88177)
@@ -25,9 +25,6 @@
* @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.
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
