Index: trunk/phase3/skins/Simple.php |
— | — | @@ -10,7 +10,7 @@ |
11 | 11 | die( -1 ); |
12 | 12 | |
13 | 13 | /** */ |
14 | | -require_once('MonoBook.php'); |
| 14 | +require_once( dirname(__FILE__) . '/MonoBook.php' ); |
15 | 15 | |
16 | 16 | /** |
17 | 17 | * @todo document |
Index: trunk/phase3/skins/MySkin.deps.php |
— | — | @@ -9,5 +9,5 @@ |
10 | 10 | die( 1 ); |
11 | 11 | |
12 | 12 | require_once('includes/SkinTemplate.php'); |
13 | | -require_once('MonoBook.php'); |
| 13 | +require_once( dirname(__FILE__) . '/MonoBook.php' ); |
14 | 14 | ?> |
Index: trunk/phase3/skins/MySkin.php |
— | — | @@ -10,7 +10,7 @@ |
11 | 11 | die( -1 ); |
12 | 12 | |
13 | 13 | /** */ |
14 | | -require_once('MonoBook.php'); |
| 14 | +require_once( dirname(__FILE__) . '/MonoBook.php' ); |
15 | 15 | |
16 | 16 | /** |
17 | 17 | * @todo document |
Index: trunk/phase3/skins/Chick.deps.php |
— | — | @@ -9,5 +9,5 @@ |
10 | 10 | die( 1 ); |
11 | 11 | |
12 | 12 | require_once('includes/SkinTemplate.php'); |
13 | | -require_once('MonoBook.php'); |
| 13 | +require_once( dirname(__FILE__) . '/MonoBook.php' ); |
14 | 14 | ?> |
Index: trunk/phase3/skins/Chick.php |
— | — | @@ -10,7 +10,7 @@ |
11 | 11 | die( -1 ); |
12 | 12 | |
13 | 13 | /** */ |
14 | | -require_once('MonoBook.php'); |
| 14 | +require_once( dirname(__FILE__) . '/MonoBook.php' ); |
15 | 15 | |
16 | 16 | /** |
17 | 17 | * @todo document |
Index: trunk/phase3/skins/Simple.deps.php |
— | — | @@ -9,5 +9,5 @@ |
10 | 10 | die( 1 ); |
11 | 11 | |
12 | 12 | require_once('includes/SkinTemplate.php'); |
13 | | -require_once('MonoBook.php'); |
| 13 | +require_once( dirname(__FILE__) . '/MonoBook.php' ); |
14 | 14 | ?> |
Index: trunk/phase3/includes/SpecialUserrights.php |
— | — | @@ -8,7 +8,7 @@ |
9 | 9 | */ |
10 | 10 | |
11 | 11 | /** */ |
12 | | -require_once('HTMLForm.php'); |
| 12 | +require_once( dirname(__FILE__) . '/HTMLForm.php'); |
13 | 13 | |
14 | 14 | /** Entry point */ |
15 | 15 | function wfSpecialUserrights() { |
Index: trunk/phase3/includes/GlobalFunctions.php |
— | — | @@ -18,9 +18,10 @@ |
19 | 19 | $wgTotalEdits = -1; |
20 | 20 | |
21 | 21 | |
22 | | -require_once( 'LogPage.php' ); |
23 | | -require_once( 'normal/UtfNormalUtil.php' ); |
24 | | -require_once( 'XmlFunctions.php' ); |
| 22 | +global $IP; |
| 23 | +require_once "$IP/includes/LogPage.php"; |
| 24 | +require_once "$IP/includes/normal/UtfNormalUtil.php"; |
| 25 | +require_once "$IP/includes/XmlFunctions.php"; |
25 | 26 | |
26 | 27 | /** |
27 | 28 | * Compatibility functions |
Index: trunk/phase3/includes/SpecialRecentchanges.php |
— | — | @@ -7,7 +7,7 @@ |
8 | 8 | /** |
9 | 9 | * |
10 | 10 | */ |
11 | | -require_once( 'ChangesList.php' ); |
| 11 | +require_once( dirname(__FILE__) . '/ChangesList.php' ); |
12 | 12 | |
13 | 13 | /** |
14 | 14 | * Constructor |
Index: trunk/phase3/includes/SpecialWatchlist.php |
— | — | @@ -7,7 +7,7 @@ |
8 | 8 | /** |
9 | 9 | * |
10 | 10 | */ |
11 | | -require_once( 'SpecialRecentchanges.php' ); |
| 11 | +require_once( dirname(__FILE__) . '/SpecialRecentchanges.php' ); |
12 | 12 | |
13 | 13 | /** |
14 | 14 | * Constructor |
Index: trunk/phase3/includes/AutoLoader.php |
— | — | @@ -313,7 +313,7 @@ |
314 | 314 | # guaranteed by entering special pages via SpecialPage members such as |
315 | 315 | # executePath(), but here we have to take a more explicit measure. |
316 | 316 | |
317 | | - require_once( 'SpecialPage.php' ); |
| 317 | + require_once( dirname(__FILE__) . '/SpecialPage.php' ); |
318 | 318 | |
319 | 319 | foreach( $wgAutoloadClasses as $class => $file ) { |
320 | 320 | if( !( class_exists( $class ) || interface_exists( $class ) ) ) { |
Index: trunk/phase3/includes/Title.php |
— | — | @@ -5,7 +5,7 @@ |
6 | 6 | */ |
7 | 7 | |
8 | 8 | /** */ |
9 | | -require_once( 'normal/UtfNormal.php' ); |
| 9 | +require_once( dirname(__FILE__) . '/normal/UtfNormal.php' ); |
10 | 10 | |
11 | 11 | define ( 'GAID_FOR_UPDATE', 1 ); |
12 | 12 | |
Index: trunk/phase3/includes/SpecialPrefixindex.php |
— | — | @@ -3,8 +3,6 @@ |
4 | 4 | * @addtogroup SpecialPage |
5 | 5 | */ |
6 | 6 | |
7 | | -require_once 'SpecialAllpages.php'; |
8 | | - |
9 | 7 | /** |
10 | 8 | * Entry point : initialise variables and call subfunctions. |
11 | 9 | * @param $par String: becomes "FOO" when called like Special:Prefixindex/FOO (default NULL) |
Index: trunk/phase3/includes/SpecialPage.php |
— | — | @@ -534,7 +534,7 @@ |
535 | 535 | $this->mFunction = $function; |
536 | 536 | } |
537 | 537 | if ( $file === 'default' ) { |
538 | | - $this->mFile = "Special{$name}.php"; |
| 538 | + $this->mFile = dirname(__FILE__) . "/Special{$name}.php"; |
539 | 539 | } else { |
540 | 540 | $this->mFile = $file; |
541 | 541 | } |
Index: trunk/phase3/includes/HistoryBlob.php |
— | — | @@ -209,7 +209,7 @@ |
210 | 210 | |
211 | 211 | /** @todo document */ |
212 | 212 | function getText() { |
213 | | - $fname = 'HistoryBlob::getText'; |
| 213 | + $fname = 'HistoryBlobStub::getText'; |
214 | 214 | global $wgBlobCache; |
215 | 215 | if( isset( $wgBlobCache[$this->mOldId] ) ) { |
216 | 216 | $obj = $wgBlobCache[$this->mOldId]; |
Index: trunk/phase3/includes/normal/UtfNormal.php |
— | — | @@ -225,7 +225,7 @@ |
226 | 226 | static function loadData() { |
227 | 227 | global $utfCombiningClass; |
228 | 228 | if( !isset( $utfCombiningClass ) ) { |
229 | | - require_once( 'UtfNormalData.inc' ); |
| 229 | + require_once( dirname(__FILE__) . '/UtfNormalData.inc' ); |
230 | 230 | } |
231 | 231 | } |
232 | 232 | |
— | — | @@ -634,7 +634,11 @@ |
635 | 635 | } |
636 | 636 | if( isset( $utfCombiningClass[$c] ) ) { |
637 | 637 | $lastClass = $utfCombiningClass[$c]; |
638 | | - @$combiners[$lastClass] .= $c; |
| 638 | + if( isset( $combiners[$lastClass] ) ) { |
| 639 | + $combiners[$lastClass] .= $c; |
| 640 | + } else { |
| 641 | + $combiners[$lastClass] = $c; |
| 642 | + } |
639 | 643 | continue; |
640 | 644 | } |
641 | 645 | } |
— | — | @@ -804,4 +808,4 @@ |
805 | 809 | } |
806 | 810 | } |
807 | 811 | |
808 | | -?> |
\ No newline at end of file |
| 812 | +?> |
Index: trunk/phase3/trackback.php |
— | — | @@ -4,9 +4,8 @@ |
5 | 5 | * @addtogroup SpecialPage |
6 | 6 | */ |
7 | 7 | require_once( './includes/WebStart.php' ); |
| 8 | +require_once( './includes/DatabaseFunctions.php' ); |
8 | 9 | |
9 | | -require_once('DatabaseFunctions.php'); |
10 | | - |
11 | 10 | /** |
12 | 11 | * |
13 | 12 | */ |
Index: trunk/phase3/thumb.php |
— | — | @@ -8,13 +8,13 @@ |
9 | 9 | require_once( './includes/WebStart.php' ); |
10 | 10 | wfProfileIn( 'thumb.php' ); |
11 | 11 | wfProfileIn( 'thumb.php-start' ); |
12 | | -require_once( 'GlobalFunctions.php' ); |
13 | | -require_once( 'ImageFunctions.php' ); |
| 12 | +require_once( './includes/GlobalFunctions.php' ); |
| 13 | +require_once( './includes/ImageFunctions.php' ); |
14 | 14 | |
15 | 15 | $wgTrivialMimeDetection = true; //don't use fancy mime detection, just check the file extension for jpg/gif/png. |
16 | 16 | |
17 | | -require_once( 'Image.php' ); |
18 | | -require_once( 'StreamFile.php' ); |
| 17 | +require_once( './includes/Image.php' ); |
| 18 | +require_once( './includes/StreamFile.php' ); |
19 | 19 | |
20 | 20 | // Get input parameters |
21 | 21 | $fileName = isset( $_REQUEST['f'] ) ? $_REQUEST['f'] : ''; |
— | — | @@ -50,7 +50,7 @@ |
51 | 51 | |
52 | 52 | // OK, no valid thumbnail, time to get out the heavy machinery |
53 | 53 | wfProfileOut( 'thumb.php-start' ); |
54 | | -require_once( 'Setup.php' ); |
| 54 | +require_once( './includes/Setup.php' ); |
55 | 55 | wfProfileIn( 'thumb.php-render' ); |
56 | 56 | |
57 | 57 | $img = Image::newFromName( $fileName ); |
Index: trunk/phase3/languages/Language.php |
— | — | @@ -22,7 +22,7 @@ |
23 | 23 | |
24 | 24 | # Read language names |
25 | 25 | global $wgLanguageNames; |
26 | | -require_once( 'Names.php' ); |
| 26 | +require_once( dirname(__FILE__) . '/Names.php' ) ; |
27 | 27 | |
28 | 28 | global $wgInputEncoding, $wgOutputEncoding; |
29 | 29 | |
— | — | @@ -772,7 +772,7 @@ |
773 | 773 | |
774 | 774 | function iconv( $in, $out, $string ) { |
775 | 775 | # For most languages, this is a wrapper for iconv |
776 | | - return iconv( $in, $out, $string ); |
| 776 | + return iconv( $in, $out . '//IGNORE', $string ); |
777 | 777 | } |
778 | 778 | |
779 | 779 | // callback functions for uc(), lc(), ucwords(), ucwordbreaks() |