dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6fec4e3
)
Fix for HipHop breakage in r87748 etc. Please do not use require_once(dirname(__FILE_...
author
Tim Starling
<tstarling@users.mediawiki.org>
Sun, 15 May 2011 13:36:59 +0000
(13:36 +0000)
committer
Tim Starling
<tstarling@users.mediawiki.org>
Sun, 15 May 2011 13:36:59 +0000
(13:36 +0000)
includes/GlobalFunctions.php
patch
|
blob
|
history
includes/Setup.php
patch
|
blob
|
history
includes/normal/Utf8CaseGenerate.php
patch
|
blob
|
history
includes/normal/Utf8Test.php
patch
|
blob
|
history
includes/normal/UtfNormal.php
patch
|
blob
|
history
includes/normal/UtfNormalBench.php
patch
|
blob
|
history
includes/normal/UtfNormalGenerate.php
patch
|
blob
|
history
includes/normal/UtfNormalMemStress.php
patch
|
blob
|
history
includes/normal/UtfNormalTest.php
patch
|
blob
|
history
includes/normal/UtfNormalUtil.php
patch
|
blob
|
history
diff --git
a/includes/GlobalFunctions.php
b/includes/GlobalFunctions.php
index
f00ef39
..
bc4a824
100644
(file)
--- a/
includes/GlobalFunctions.php
+++ b/
includes/GlobalFunctions.php
@@
-8,10
+8,6
@@
if ( !defined( 'MEDIAWIKI' ) ) {
die( "This file is part of MediaWiki, it is not a valid entry point" );
}
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
// Hide compatibility functions from Doxygen
/// @cond
diff --git
a/includes/Setup.php
b/includes/Setup.php
index
3ca8b2c
..
706155a
100644
(file)
--- a/
includes/Setup.php
+++ b/
includes/Setup.php
@@
-326,6
+326,7
@@
if ( !defined( 'MW_COMPILED' ) ) {
wfProfileOut( $fname . '-exception' );
wfProfileIn( $fname . '-includes' );
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" );
require_once( "$IP/includes/GlobalFunctions.php" );
require_once( "$IP/includes/Hooks.php" );
require_once( "$IP/includes/ProxyTools.php" );
diff --git
a/includes/normal/Utf8CaseGenerate.php
b/includes/normal/Utf8CaseGenerate.php
index
8dbff1d
..
368d0bc
100644
(file)
--- a/
includes/normal/Utf8CaseGenerate.php
+++ b/
includes/normal/Utf8CaseGenerate.php
@@
-29,6
+29,7
@@
if( php_sapi_name() != 'cli' ) {
die( "Run me from the command line please.\n" );
}
die( "Run me from the command line please.\n" );
}
+require_once 'UtfNormalDefines.php';
require_once 'UtfNormalUtil.php';
$in = fopen("UnicodeData.txt", "rt" );
require_once 'UtfNormalUtil.php';
$in = fopen("UnicodeData.txt", "rt" );
diff --git
a/includes/normal/Utf8Test.php
b/includes/normal/Utf8Test.php
index
53108bc
..
6eae6e7
100644
(file)
--- a/
includes/normal/Utf8Test.php
+++ b/
includes/normal/Utf8Test.php
@@
-26,6
+26,8
@@
*/
/** */
*/
/** */
+
+require_once 'UtfNormalDefines.php';
require_once 'UtfNormalUtil.php';
require_once 'UtfNormal.php';
mb_internal_encoding( "utf-8" );
require_once 'UtfNormalUtil.php';
require_once 'UtfNormal.php';
mb_internal_encoding( "utf-8" );
diff --git
a/includes/normal/UtfNormal.php
b/includes/normal/UtfNormal.php
index
46682ca
..
919278c
100644
(file)
--- a/
includes/normal/UtfNormal.php
+++ b/
includes/normal/UtfNormal.php
@@
-28,8
+28,6
@@
* @defgroup UtfNormal UtfNormal
*/
* @defgroup UtfNormal UtfNormal
*/
-require_once dirname(__FILE__).'/UtfNormalUtil.php';
-
/**
* For using the ICU wrapper
*/
/**
* For using the ICU wrapper
*/
diff --git
a/includes/normal/UtfNormalBench.php
b/includes/normal/UtfNormalBench.php
index
2229dbb
..
944c443
100644
(file)
--- a/
includes/normal/UtfNormalBench.php
+++ b/
includes/normal/UtfNormalBench.php
@@
-28,6
+28,7
@@
if( isset( $_SERVER['argv'] ) && in_array( '--icu', $_SERVER['argv'] ) ) {
dl( 'php_utfnormal.so' );
}
dl( 'php_utfnormal.so' );
}
+require_once 'UtfNormalDefines.php';
require_once 'UtfNormalUtil.php';
require_once 'UtfNormal.php';
require_once 'UtfNormalUtil.php';
require_once 'UtfNormal.php';
diff --git
a/includes/normal/UtfNormalGenerate.php
b/includes/normal/UtfNormalGenerate.php
index
a5e2885
..
e4c1138
100644
(file)
--- a/
includes/normal/UtfNormalGenerate.php
+++ b/
includes/normal/UtfNormalGenerate.php
@@
-29,6
+29,7
@@
if( php_sapi_name() != 'cli' ) {
die( "Run me from the command line please.\n" );
}
die( "Run me from the command line please.\n" );
}
+require_once 'UtfNormalDefines.php';
require_once 'UtfNormalUtil.php';
$in = fopen("DerivedNormalizationProps.txt", "rt" );
require_once 'UtfNormalUtil.php';
$in = fopen("DerivedNormalizationProps.txt", "rt" );
diff --git
a/includes/normal/UtfNormalMemStress.php
b/includes/normal/UtfNormalMemStress.php
index
3f7f1e1
..
1277dc2
100644
(file)
--- a/
includes/normal/UtfNormalMemStress.php
+++ b/
includes/normal/UtfNormalMemStress.php
@@
-30,6
+30,7
@@
if( isset( $_SERVER['argv'] ) && in_array( '--icu', $_SERVER['argv'] ) ) {
dl( 'php_utfnormal.so' );
}
dl( 'php_utfnormal.so' );
}
+require_once 'UtfNormalDefines.php';
require_once 'UtfNormalUtil.php';
require_once 'UtfNormal.php';
require_once 'UtfNormalUtil.php';
require_once 'UtfNormal.php';
diff --git
a/includes/normal/UtfNormalTest.php
b/includes/normal/UtfNormalTest.php
index
f78775c
..
e5ae7f7
100644
(file)
--- a/
includes/normal/UtfNormalTest.php
+++ b/
includes/normal/UtfNormalTest.php
@@
-49,6
+49,7
@@
if( isset( $_SERVER['argv'] ) && in_array( '--icu', $_SERVER['argv'] ) ) {
dl( 'php_utfnormal.so' );
}
dl( 'php_utfnormal.so' );
}
+require_once 'UtfNormalDefines.php';
require_once 'UtfNormalUtil.php';
require_once 'UtfNormal.php';
require_once 'UtfNormalUtil.php';
require_once 'UtfNormal.php';
diff --git
a/includes/normal/UtfNormalUtil.php
b/includes/normal/UtfNormalUtil.php
index
f2b12d4
..
bfad709
100644
(file)
--- a/
includes/normal/UtfNormalUtil.php
+++ b/
includes/normal/UtfNormalUtil.php
@@
-25,9
+25,6
@@
* @ingroup UtfNormal
*/
* @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.
/**
* Return UTF-8 sequence for a given Unicode code point.
* May die if fed out of range data.