| Index: trunk/phase3/includes/json/Services_JSON.php |
| — | — | @@ -431,7 +431,7 @@ |
| 432 | 432 | $this->indent--; |
| 433 | 433 | |
| 434 | 434 | foreach($properties as $property) { |
| 435 | | - if(Services_JSON::isError($property)) { |
| | 435 | + if($this->isError($property)) { |
| 436 | 436 | return $property; |
| 437 | 437 | } |
| 438 | 438 | } |
| — | — | @@ -445,7 +445,7 @@ |
| 446 | 446 | $this->indent--; |
| 447 | 447 | |
| 448 | 448 | foreach($elements as $element) { |
| 449 | | - if(Services_JSON::isError($element)) { |
| | 449 | + if($this->isError($element)) { |
| 450 | 450 | return $element; |
| 451 | 451 | } |
| 452 | 452 | } |
| — | — | @@ -462,7 +462,7 @@ |
| 463 | 463 | $this->indent--; |
| 464 | 464 | |
| 465 | 465 | foreach($properties as $property) { |
| 466 | | - if(Services_JSON::isError($property)) { |
| | 466 | + if($this->isError($property)) { |
| 467 | 467 | return $property; |
| 468 | 468 | } |
| 469 | 469 | } |
| — | — | @@ -489,7 +489,7 @@ |
| 490 | 490 | { |
| 491 | 491 | $encoded_value = $this->encode2($value); |
| 492 | 492 | |
| 493 | | - if(Services_JSON::isError($encoded_value)) { |
| | 493 | + if($this->isError($encoded_value)) { |
| 494 | 494 | return $encoded_value; |
| 495 | 495 | } |
| 496 | 496 | |
| Index: trunk/phase3/includes/parser/Preprocessor_DOM.php |
| — | — | @@ -1263,7 +1263,8 @@ |
| 1264 | 1264 | var $numberedExpansionCache, $namedExpansionCache; |
| 1265 | 1265 | |
| 1266 | 1266 | function __construct( $preprocessor, $parent = false, $numberedArgs = array(), $namedArgs = array(), $title = false ) { |
| 1267 | | - PPFrame_DOM::__construct( $preprocessor ); |
| | 1267 | + parent::__construct( $preprocessor ); |
| | 1268 | + |
| 1268 | 1269 | $this->parent = $parent; |
| 1269 | 1270 | $this->numberedArgs = $numberedArgs; |
| 1270 | 1271 | $this->namedArgs = $namedArgs; |
| — | — | @@ -1375,7 +1376,7 @@ |
| 1376 | 1377 | var $args; |
| 1377 | 1378 | |
| 1378 | 1379 | function __construct( $preprocessor, $args ) { |
| 1379 | | - PPFrame_DOM::__construct( $preprocessor ); |
| | 1380 | + parent::__construct( $preprocessor ); |
| 1380 | 1381 | $this->args = $args; |
| 1381 | 1382 | } |
| 1382 | 1383 | |
| Index: trunk/phase3/includes/parser/Preprocessor_Hash.php |
| — | — | @@ -1213,7 +1213,8 @@ |
| 1214 | 1214 | var $numberedExpansionCache, $namedExpansionCache; |
| 1215 | 1215 | |
| 1216 | 1216 | function __construct( $preprocessor, $parent = false, $numberedArgs = array(), $namedArgs = array(), $title = false ) { |
| 1217 | | - PPFrame_Hash::__construct( $preprocessor ); |
| | 1217 | + parent::__construct( $preprocessor ); |
| | 1218 | + |
| 1218 | 1219 | $this->parent = $parent; |
| 1219 | 1220 | $this->numberedArgs = $numberedArgs; |
| 1220 | 1221 | $this->namedArgs = $namedArgs; |
| — | — | @@ -1325,7 +1326,7 @@ |
| 1326 | 1327 | var $args; |
| 1327 | 1328 | |
| 1328 | 1329 | function __construct( $preprocessor, $args ) { |
| 1329 | | - PPFrame_Hash::__construct( $preprocessor ); |
| | 1330 | + parent::__construct( $preprocessor ); |
| 1330 | 1331 | $this->args = $args; |
| 1331 | 1332 | } |
| 1332 | 1333 | |
| Index: trunk/phase3/includes/filerepo/FileRepo.php |
| — | — | @@ -378,7 +378,7 @@ |
| 379 | 379 | */ |
| 380 | 380 | function getDescriptionStylesheetUrl() { |
| 381 | 381 | if ( $this->scriptDirUrl ) { |
| 382 | | - return self::makeUrl( 'title=MediaWiki:Filepage.css&' . |
| | 382 | + return $this->makeUrl( 'title=MediaWiki:Filepage.css&' . |
| 383 | 383 | wfArrayToCGI( Skin::getDynamicStylesheetQuery() ) ); |
| 384 | 384 | } |
| 385 | 385 | } |
| Index: trunk/phase3/languages/classes/LanguageKk_cyrl.php |
| — | — | @@ -477,9 +477,9 @@ |
| 478 | 478 | $secondPerson = array( "ز" ); // 1st plural, 2nd formal |
| 479 | 479 | $thirdPerson = array( "ى", "ٸ" ); // 3rd |
| 480 | 480 | |
| 481 | | - $lastLetter = self::lastLetter( $word, $allVowels ); |
| 482 | | - $wordEnding =& $lastLetter[0]; |
| 483 | | - $wordLastVowel =& $lastLetter[1]; |
| | 481 | + $lastLetter = $this->lastLetter( $word, $allVowels ); |
| | 482 | + $wordEnding = $lastLetter[0]; |
| | 483 | + $wordLastVowel = $lastLetter[1]; |
| 484 | 484 | |
| 485 | 485 | // Now convert the word |
| 486 | 486 | switch ( $case ) { |