| Index: branches/REL1_18/phase3/tests/phpunit/includes/parser/NewParserTest.php |
| — | — | @@ -1,9 +1,11 @@ |
| 2 | 2 | <?php |
| 3 | 3 | |
| 4 | 4 | /** |
| | 5 | + * Although marked as a stub, can work independently. |
| | 6 | + * |
| 5 | 7 | * @group Database |
| 6 | 8 | * @group Parser |
| 7 | | - * @group Stub (can also work independently) |
| | 9 | + * @group Stub |
| 8 | 10 | */ |
| 9 | 11 | class NewParserTest extends MediaWikiTestCase { |
| 10 | 12 | |
| Property changes on: branches/REL1_18/phase3/tests/phpunit/includes/parser/NewParserTest.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 11 | 13 | Merged /branches/new-installer/phase3/tests/phpunit/includes/parser/NewParserTest.php:r43664-66004 |
| 12 | 14 | Merged /branches/REL1_15/phase3/tests/phpunit/includes/parser/NewParserTest.php:r51646 |
| 13 | 15 | Merged /branches/REL1_17/phase3/tests/phpunit/includes/parser/NewParserTest.php:r81445,81448 |
| 14 | 16 | Merged /branches/sqlite/tests/phpunit/includes/parser/NewParserTest.php:r58211-58321 |
| 15 | 17 | Merged /trunk/phase3/tests/phpunit/includes/parser/NewParserTest.php:r87627-87628,87630,87632,87636,87640,87644,87998,88134,88231-88232,88250,88513,88769,89099,89108,89227,89301,89479-89480,90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Index: branches/REL1_18/phase3/includes/Block.php |
| — | — | @@ -614,7 +614,7 @@ |
| 615 | 615 | $autoblock->prevents( 'editownusertalk', $this->prevents( 'editownusertalk' ) ); |
| 616 | 616 | |
| 617 | 617 | $dbr = wfGetDB( DB_READ ); |
| 618 | | - if ( $this->mTimestamp == $dbr->getInfinity() ) { |
| | 618 | + if ( $this->mExpiry == $dbr->getInfinity() ) { |
| 619 | 619 | # Original block was indefinite, start an autoblock now |
| 620 | 620 | $autoblock->mExpiry = Block::getAutoblockExpiry( wfTimestampNow() ); |
| 621 | 621 | } else { |
| — | — | @@ -701,7 +701,7 @@ |
| 702 | 702 | public function getRangeStart() { |
| 703 | 703 | switch( $this->type ) { |
| 704 | 704 | case self::TYPE_USER: |
| 705 | | - return null; |
| | 705 | + return ''; |
| 706 | 706 | case self::TYPE_IP: |
| 707 | 707 | return IP::toHex( $this->target ); |
| 708 | 708 | case self::TYPE_RANGE: |
| — | — | @@ -718,7 +718,7 @@ |
| 719 | 719 | public function getRangeEnd() { |
| 720 | 720 | switch( $this->type ) { |
| 721 | 721 | case self::TYPE_USER: |
| 722 | | - return null; |
| | 722 | + return ''; |
| 723 | 723 | case self::TYPE_IP: |
| 724 | 724 | return IP::toHex( $this->target ); |
| 725 | 725 | case self::TYPE_RANGE: |
| Property changes on: branches/REL1_18/phase3/includes/Block.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 726 | 726 | Merged /branches/new-installer/phase3/includes/Block.php:r43664-66004 |
| 727 | 727 | Merged /branches/wmf-deployment/includes/Block.php:r53381 |
| 728 | 728 | Merged /branches/REL1_15/phase3/includes/Block.php:r51646 |
| 729 | 729 | Merged /branches/sqlite/includes/Block.php:r58211-58321 |
| 730 | 730 | Merged /trunk/phase3/includes/Block.php:r87586,87627-87628,87630,87840,87998,88085,88118,88124,88134,88231-88232,88250,88492,88498,88513,89099,89108,89668,90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812,90860 |