| Index: trunk/phase3/maintenance/tests/phpunit/includes/TitleTest.php |
| — | — | @@ -1,10 +1,6 @@ |
| 2 | 2 | <?php |
| 3 | 3 | |
| 4 | 4 | class TitleTest extends PHPUnit_Framework_TestCase { |
| 5 | | - function setUp() { |
| 6 | | - global $wgContLang; |
| 7 | | - $wgContLang = Language::factory( 'en' ); |
| 8 | | - } |
| 9 | 5 | |
| 10 | 6 | function testLegalChars() { |
| 11 | 7 | $titlechars = Title::legalChars(); |
| — | — | @@ -18,23 +14,4 @@ |
| 19 | 15 | } |
| 20 | 16 | } |
| 21 | 17 | } |
| 22 | | - |
| 23 | | - /** |
| 24 | | - * Test originally wrote to investigate bug 24343 |
| 25 | | - */ |
| 26 | | - function testGetURLS() { |
| 27 | | - global $wgArticlePath; |
| 28 | | - |
| 29 | | - $title = Title::newFromText( 'User:Bob#section' ); |
| 30 | | - |
| 31 | | - $this->assertEquals( str_replace( '$1', 'User:Bob', $wgArticlePath ), $title->getLocalURL(), |
| 32 | | - 'Title::getLocalURL() does NOT have fragment' ); |
| 33 | | - $this->assertEquals( str_replace( '$1', 'User:Bob', $wgArticlePath ), $title->escapeLocalURL(), |
| 34 | | - 'Title::escapeLocalURL() does NOT have fragment' ); |
| 35 | | - $this->assertEquals( str_replace( '$1', 'User:Bob#section', $wgArticlePath ), $title->getLinkURL(), |
| 36 | | - 'Title::getLinkURL() does have fragment' ); |
| 37 | | - |
| 38 | | - #$this->assertEquals( 'toto', $title->getFullURL() ); |
| 39 | | - #$this->assertEquals( 'toto', $title->escapeFullURL() ); |
| 40 | | - } |
| 41 | 18 | } |
| Index: trunk/phase3/includes/parser/CoreParserFunctions.php |
| — | — | @@ -31,7 +31,6 @@ |
| 32 | 32 | $parser->setFunctionHook( 'localurle', array( __CLASS__, 'localurle' ), SFH_NO_HASH ); |
| 33 | 33 | $parser->setFunctionHook( 'fullurl', array( __CLASS__, 'fullurl' ), SFH_NO_HASH ); |
| 34 | 34 | $parser->setFunctionHook( 'fullurle', array( __CLASS__, 'fullurle' ), SFH_NO_HASH ); |
| 35 | | - $parser->setFunctionHook( 'linkurl', array( __CLASS__, 'linkurl' ), SFH_NO_HASH ); |
| 36 | 35 | $parser->setFunctionHook( 'formatnum', array( __CLASS__, 'formatnum' ), SFH_NO_HASH ); |
| 37 | 36 | $parser->setFunctionHook( 'grammar', array( __CLASS__, 'grammar' ), SFH_NO_HASH ); |
| 38 | 37 | $parser->setFunctionHook( 'gender', array( __CLASS__, 'gender' ), SFH_NO_HASH ); |
| — | — | @@ -195,7 +194,6 @@ |
| 196 | 195 | static function localurle( $parser, $s = '', $arg = null ) { return self::urlFunction( 'escapeLocalURL', $s, $arg ); } |
| 197 | 196 | static function fullurl( $parser, $s = '', $arg = null ) { return self::urlFunction( 'getFullURL', $s, $arg ); } |
| 198 | 197 | static function fullurle( $parser, $s = '', $arg = null ) { return self::urlFunction( 'escapeFullURL', $s, $arg ); } |
| 199 | | - static function linkurl( $parser, $s = '', $arg = null ) { return self::urlFunction( 'getLinkUrl', $s, $arg ); } |
| 200 | 198 | |
| 201 | 199 | static function urlFunction( $func, $s = '', $arg = null ) { |
| 202 | 200 | $title = Title::newFromText( $s ); |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -295,7 +295,6 @@ |
| 296 | 296 | 'nse' => array( 0, 'NSE:' ), |
| 297 | 297 | 'localurl' => array( 0, 'LOCALURL:' ), |
| 298 | 298 | 'localurle' => array( 0, 'LOCALURLE:' ), |
| 299 | | - 'linkurl' => array( 0, 'LINKURL:' ), |
| 300 | 299 | 'articlepath' => array( 0, 'ARTICLEPATH' ), |
| 301 | 300 | 'server' => array( 0, 'SERVER' ), |
| 302 | 301 | 'servername' => array( 0, 'SERVERNAME' ), |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -176,7 +176,6 @@ |
| 177 | 177 | limit for IP addresses: [[MediaWiki:Ratelimit-excluded-ips]] |
| 178 | 178 | * Special:Version now displays whether a SQLite database supports full-text |
| 179 | 179 | search. |
| 180 | | -* (bug 24343) New parser hook {{linkurl:}}, same as {{localurl:}} with fragment |
| 181 | 180 | * TS_ISO_8691_BASIC was added as a time format, which is used by ResourceLoader |
| 182 | 181 | for versioning |
| 183 | 182 | * Maintenance scripts get a --memory-limit option to override defaults (which |