| Index: branches/REL1_18/phase3/includes/api/ApiExpandTemplates.php |
| — | — | @@ -90,7 +90,10 @@ |
| 91 | 91 | 'title' => array( |
| 92 | 92 | ApiBase::PARAM_DFLT => 'API', |
| 93 | 93 | ), |
| 94 | | - 'text' => null, |
| | 94 | + 'text' => array( |
| | 95 | + ApiBase::PARAM_TYPE => 'string', |
| | 96 | + ApiBase::PARAM_REQUIRED => true, |
| | 97 | + ), |
| 95 | 98 | 'generatexml' => false, |
| 96 | 99 | 'includecomments' => false, |
| 97 | 100 | ); |
| Property changes on: branches/REL1_18/phase3/includes/api |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 98 | 101 | Merged /trunk/phase3/includes/api:r93977,98884,98963,98975 |
| Index: branches/REL1_18/phase3/includes/SkinLegacy.php |
| — | — | @@ -66,10 +66,10 @@ |
| 67 | 67 | } |
| 68 | 68 | |
| 69 | 69 | class LegacyTemplate extends BaseTemplate { |
| 70 | | - |
| | 70 | + |
| 71 | 71 | // How many search boxes have we made? Avoid duplicate id's. |
| 72 | 72 | protected $searchboxes = ''; |
| 73 | | - |
| | 73 | + |
| 74 | 74 | function execute() { |
| 75 | 75 | $this->html( 'headelement' ); |
| 76 | 76 | echo $this->beforeContent(); |
| — | — | @@ -80,7 +80,7 @@ |
| 81 | 81 | $this->printTrail(); |
| 82 | 82 | echo "\n</body></html>"; |
| 83 | 83 | } |
| 84 | | - |
| | 84 | + |
| 85 | 85 | /** |
| 86 | 86 | * This will be called immediately after the <body> tag. Split into |
| 87 | 87 | * two functions to make it easier to subclass. |
| — | — | @@ -484,7 +484,7 @@ |
| 485 | 485 | |
| 486 | 486 | if ( $image ) { |
| 487 | 487 | $link = htmlspecialchars( $image->getURL() ); |
| 488 | | - $style = $this->getInternalLinkAttributes( $link, $name ); |
| | 488 | + $style = Linker::getInternalLinkAttributes( $link, $name ); |
| 489 | 489 | $s[] = "<a href=\"{$link}\"{$style}>{$name}</a>"; |
| 490 | 490 | } |
| 491 | 491 | } |
| Index: branches/REL1_18/phase3/includes/specials/SpecialBlock.php |
| — | — | @@ -503,7 +503,7 @@ |
| 504 | 504 | list( $ip, $range ) = explode( '/', $target, 2 ); |
| 505 | 505 | |
| 506 | 506 | if( ( IP::isIPv4( $ip ) && $wgBlockCIDRLimit['IPv4'] == 32 ) |
| 507 | | - || ( IP::isIPv6( $ip ) && $wgBlockCIDRLimit['IPV6'] == 128 ) ) |
| | 507 | + || ( IP::isIPv6( $ip ) && $wgBlockCIDRLimit['IPv6'] == 128 ) ) |
| 508 | 508 | { |
| 509 | 509 | # Range block effectively disabled |
| 510 | 510 | return wfMessage( 'range_block_disabled' ); |
| Property changes on: branches/REL1_18/phase3/includes/specials/SpecialBlock.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 511 | 511 | Merged /trunk/phase3/includes/specials/SpecialBlock.php:r98975 |
| Property changes on: branches/REL1_18/phase3/includes/specials |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 512 | 512 | Merged /trunk/phase3/includes/specials:r98975 |
| Property changes on: branches/REL1_18/phase3/includes |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 513 | 513 | Merged /trunk/phase3/includes:r93977,98884,98963,98975 |
| Index: branches/REL1_18/phase3/languages/Names.php |
| — | — | @@ -148,7 +148,7 @@ |
| 149 | 149 | 'it' => 'Italiano', # Italian |
| 150 | 150 | 'iu' => 'ᐃᓄᒃᑎᑐᑦ/inuktitut', # Inuktitut (macro language - do no localise, see ike/ikt - falls back to ike-cans) |
| 151 | 151 | 'ja' => '日本語', # Japanese |
| 152 | | - 'jam' => 'Patios', # Jamaican Creole English |
| | 152 | + 'jam' => 'Patois', # Jamaican Creole English |
| 153 | 153 | 'jbo' => 'Lojban', # Lojban |
| 154 | 154 | 'jut' => 'Jysk', # Jutish / Jutlandic |
| 155 | 155 | 'jv' => 'Basa Jawa', # Javanese |
| Property changes on: branches/REL1_18/phase3/languages |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 156 | 156 | Merged /trunk/phase3/languages:r98884,98963,98975 |
| Property changes on: branches/REL1_18/phase3 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 157 | 157 | Merged /trunk/phase3:r93977,98884,98963,98975 |