| Index: branches/wmf/1.19wmf1/tests/phpunit/includes/BlockTest.php |
| — | — | @@ -35,7 +35,7 @@ |
| 36 | 36 | $oldBlock->delete(); |
| 37 | 37 | } |
| 38 | 38 | |
| 39 | | - $this->block = new Block( 'UTBlockee', 1, 0, |
| | 39 | + $this->block = new Block( 'UTBlockee', $user->getID(), 0, |
| 40 | 40 | 'Parce que', 0, false, time() + 100500 |
| 41 | 41 | ); |
| 42 | 42 | $this->madeAt = wfTimestamp( TS_MW ); |
| Index: branches/wmf/1.19wmf1/tests/phpunit/includes/TitlePermissionTest.php |
| — | — | @@ -629,7 +629,7 @@ |
| 630 | 630 | $prev = time(); |
| 631 | 631 | $now = time() + 120; |
| 632 | 632 | $this->user->mBlockedby = $this->user->getId(); |
| 633 | | - $this->user->mBlock = new Block( '127.0.8.1', $this->user->getId(), $this->user->getId(), |
| | 633 | + $this->user->mBlock = new Block( '127.0.8.1', 0, $this->user->getId(), |
| 634 | 634 | 'no reason given', $prev + 3600, 1, 0 ); |
| 635 | 635 | $this->user->mBlock->mTimestamp = 0; |
| 636 | 636 | $this->assertEquals( array( array( 'autoblockedtext', |
| — | — | @@ -646,7 +646,7 @@ |
| 647 | 647 | global $wgLocalTZoffset; |
| 648 | 648 | $wgLocalTZoffset = -60; |
| 649 | 649 | $this->user->mBlockedby = $this->user->getName(); |
| 650 | | - $this->user->mBlock = new Block( '127.0.8.1', 2, 1, 'no reason given', $now, 0, 10 ); |
| | 650 | + $this->user->mBlock = new Block( '127.0.8.1', 0, 1, 'no reason given', $now, 0, 10 ); |
| 651 | 651 | $this->assertEquals( array( array( 'blockedtext', |
| 652 | 652 | '[[User:Useruser|Useruser]]', 'no reason given', '127.0.0.1', |
| 653 | 653 | 'Useruser', null, '23:00, 31 December 1969', '127.0.8.1', |
| Property changes on: branches/wmf/1.19wmf1 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 654 | 654 | Merged /trunk/phase3:r112566 |