Fix for partial regression in r84534: Block::newFromId was no longer handling the...
authorBrion Vibber <brion@users.mediawiki.org>
Wed, 15 Jun 2011 19:05:25 +0000 (19:05 +0000)
committerBrion Vibber <brion@users.mediawiki.org>
Wed, 15 Jun 2011 19:05:25 +0000 (19:05 +0000)
commit39259a36ec95520d7ad4d704a2f0d31fb225966a
tree64d848aaca558ab23e63d0e43edb9bad1832d916
parentb6905779bd13f9ec0a51cbc2093bb51fd6d37b46
Fix for partial regression in r84534: Block::newFromId was no longer handling the case where there was no matching row correctly. Now returns null.

This bug was showing up in test results like this:

  BlockTest::testInitializerFunctionsReturnCorrectBlock
  Trying to get property of non-object

  /home/ci/cruisecontrol-bin-2.8.3/projects/mw/source/includes/Block.php:340
  /home/ci/cruisecontrol-bin-2.8.3/projects/mw/source/includes/Block.php:365
  /home/ci/cruisecontrol-bin-2.8.3/projects/mw/source/includes/Block.php:118
  /home/ci/cruisecontrol-bin-2.8.3/projects/mw/source/tests/phpunit/includes/BlockTest.php:60
  /home/ci/cruisecontrol-bin-2.8.3/projects/mw/source/tests/phpunit/MediaWikiTestCase.php:60
  /home/ci/cruisecontrol-bin-2.8.3/projects/mw/source/tests/phpunit/MediaWikiPHPUnitCommand.php:20
  /home/ci/cruisecontrol-bin-2.8.3/projects/mw/source/tests/phpunit/phpunit.php:60

However, that only triggers because the actual test is failing -- it's expecting to get a return back. This can only be reproduce when using the suite.xml configuration file, and not when running the BlockTest standalone.
includes/Block.php