| Index: trunk/phase3/tests/phpunit/includes/ArticleTablesTest.php |
| — | — | @@ -18,7 +18,10 @@ |
| 19 | 19 | $wgContLang = new StubContLang; |
| 20 | 20 | $wgLang = new StubUserLang; |
| 21 | 21 | } |
| 22 | | - |
| | 22 | + |
| | 23 | + /** |
| | 24 | + * @group Broken |
| | 25 | + */ |
| 23 | 26 | function testbug14404() { |
| 24 | 27 | global $wgUser, $wgContLang, $wgLanguageCode, $wgLang; |
| 25 | 28 | |
| Index: trunk/phase3/tests/phpunit/includes/TitlePermissionTest.php |
| — | — | @@ -625,7 +625,7 @@ |
| 626 | 626 | $this->user->mBlock->mTimestamp = 0; |
| 627 | 627 | $this->assertEquals( array( array( 'autoblockedtext', |
| 628 | 628 | '[[User:Useruser|Useruser]]', 'no reason given', '127.0.0.1', |
| 629 | | - 'Useruser', 0, 'infinite', '127.0.8.1', |
| | 629 | + 'Useruser', null, 'infinite', '127.0.8.1', |
| 630 | 630 | $wgLang->timeanddate( wfTimestamp( TS_MW, $prev ), true ) ) ), |
| 631 | 631 | $this->title->getUserPermissionsErrors( 'move-target', |
| 632 | 632 | $this->user ) ); |
| — | — | @@ -639,7 +639,7 @@ |
| 640 | 640 | $this->user->mBlock = new Block( '127.0.8.1', 2, 1, 'no reason given', $now, 0, 10 ); |
| 641 | 641 | $this->assertEquals( array( array( 'blockedtext', |
| 642 | 642 | '[[User:Useruser|Useruser]]', 'no reason given', '127.0.0.1', |
| 643 | | - 'Useruser', 0, '23:00, 31 December 1969', '127.0.8.1', |
| | 643 | + 'Useruser', null, '23:00, 31 December 1969', '127.0.8.1', |
| 644 | 644 | $wgLang->timeanddate( wfTimestamp( TS_MW, $now ), true ) ) ), |
| 645 | 645 | $this->title->getUserPermissionsErrors( 'move-target', $this->user ) ); |
| 646 | 646 | |
| Index: trunk/phase3/tests/phpunit/includes/api/ApiTestCaseUpload.php |
| — | — | @@ -18,10 +18,6 @@ |
| 19 | 19 | $wgEnableAPI = true; |
| 20 | 20 | wfSetupSession(); |
| 21 | 21 | |
| 22 | | - ini_set( 'log_errors', 1 ); |
| 23 | | - ini_set( 'error_reporting', 1 ); |
| 24 | | - ini_set( 'display_errors', 1 ); |
| 25 | | - |
| 26 | 22 | $this->clearFakeUploads(); |
| 27 | 23 | } |
| 28 | 24 | |
| — | — | @@ -51,7 +47,7 @@ |
| 52 | 48 | $article->doDeleteArticle( "removing for test" ); |
| 53 | 49 | |
| 54 | 50 | // see if it now doesn't exist; reload |
| 55 | | - $title = Title::newFromText( $fileName, NS_FILE ); |
| | 51 | + $title = Title::newFromText( $title->getText(), NS_FILE ); |
| 56 | 52 | } |
| 57 | 53 | return ! ( $title && $title instanceof Title && $title->exists() ); |
| 58 | 54 | } |
| Index: trunk/phase3/tests/phpunit/includes/api/RandomImageGenerator.php |
| — | — | @@ -34,7 +34,7 @@ |
| 35 | 35 | private $circlesToDraw = 5; |
| 36 | 36 | private $imageWriteMethod; |
| 37 | 37 | |
| 38 | | - public function __construct( $options ) { |
| | 38 | + public function __construct( $options = array() ) { |
| 39 | 39 | global $wgUseImageMagick, $wgImageMagickConvertCommand; |
| 40 | 40 | foreach ( array( 'dictionaryFile', 'minWidth', 'minHeight', 'maxHeight', 'circlesToDraw' ) as $property ) { |
| 41 | 41 | if ( isset( $options[$property] ) ) { |
| Index: trunk/phase3/tests/phpunit/includes/api/ApiQueryTest.php |
| — | — | @@ -14,7 +14,7 @@ |
| 15 | 15 | |
| 16 | 16 | function testTitlesGetNormalized() { |
| 17 | 17 | |
| 18 | | - global $wgSitename; |
| | 18 | + global $wgMetaNamespace; |
| 19 | 19 | |
| 20 | 20 | $data = $this->doApiRequest( array( |
| 21 | 21 | 'action' => 'query', |
| — | — | @@ -27,7 +27,7 @@ |
| 28 | 28 | $this->assertEquals( |
| 29 | 29 | array( |
| 30 | 30 | 'from' => 'Project:articleA', |
| 31 | | - 'to' => $wgSitename . ':ArticleA' |
| | 31 | + 'to' => $wgMetaNamespace . ':ArticleA' |
| 32 | 32 | ), |
| 33 | 33 | $data[0]['query']['normalized'][0] |
| 34 | 34 | ); |
| Index: trunk/phase3/includes/api/ApiBlock.php |
| — | — | @@ -90,6 +90,7 @@ |
| 91 | 91 | 'DisableUTEdit' => $params['allowusertalk'], |
| 92 | 92 | 'AlreadyBlocked' => $params['reblock'], |
| 93 | 93 | 'Watch' => $params['watchuser'], |
| | 94 | + 'Confirm' => true, |
| 94 | 95 | ); |
| 95 | 96 | |
| 96 | 97 | $retval = SpecialBlock::processForm( $data ); |
| Index: trunk/phase3/includes/Title.php |
| — | — | @@ -1563,12 +1563,12 @@ |
| 1564 | 1564 | $blockExpiry = $user->mBlock->mExpiry; |
| 1565 | 1565 | $blockTimestamp = $wgLang->timeanddate( wfTimestamp( TS_MW, $user->mBlock->mTimestamp ), true ); |
| 1566 | 1566 | if ( $blockExpiry == 'infinity' ) { |
| 1567 | | - $blockExpiry = wfMessage( 'infiniteblock' ); |
| | 1567 | + $blockExpiry = wfMessage( 'infiniteblock' )->text(); |
| 1568 | 1568 | } else { |
| 1569 | 1569 | $blockExpiry = $wgLang->timeanddate( wfTimestamp( TS_MW, $blockExpiry ), true ); |
| 1570 | 1570 | } |
| 1571 | 1571 | |
| 1572 | | - $intended = $user->mBlock->getTarget(); |
| | 1572 | + $intended = strval( $user->mBlock->getTarget() ); |
| 1573 | 1573 | |
| 1574 | 1574 | $errors[] = array( ( $block->mAuto ? 'autoblockedtext' : 'blockedtext' ), $link, $reason, $ip, $name, |
| 1575 | 1575 | $blockid, $blockExpiry, $intended, $blockTimestamp ); |
| Index: trunk/phase3/includes/Block.php |
| — | — | @@ -444,6 +444,7 @@ |
| 445 | 445 | if( !$db ){ |
| 446 | 446 | $db = wfGetDB( DB_SLAVE ); |
| 447 | 447 | } |
| | 448 | + $this->mExpiry = $db->encodeExpiry( $this->mExpiry ); |
| 448 | 449 | |
| 449 | 450 | $a = array( |
| 450 | 451 | 'ipb_address' => (string)$this->target, |
| — | — | @@ -456,7 +457,7 @@ |
| 457 | 458 | 'ipb_anon_only' => !$this->isHardblock(), |
| 458 | 459 | 'ipb_create_account' => $this->prevents( 'createaccount' ), |
| 459 | 460 | 'ipb_enable_autoblock' => $this->isAutoblocking(), |
| 460 | | - 'ipb_expiry' => $db->encodeExpiry( $this->mExpiry ), |
| | 461 | + 'ipb_expiry' => $this->mExpiry, |
| 461 | 462 | 'ipb_range_start' => $this->getRangeStart(), |
| 462 | 463 | 'ipb_range_end' => $this->getRangeEnd(), |
| 463 | 464 | 'ipb_deleted' => intval( $this->mHideName ), // typecast required for SQLite |