From 5b33ae42d9a46003e44305dded69bf6f10ccf013 Mon Sep 17 00:00:00 2001 From: aude Date: Fri, 25 Jan 2013 10:55:07 +0000 Subject: [PATCH] (bug 44338) set the site internal id when loading sites from the db Change-Id: Id0d76255e8f12ac7101b8334e3968cdbf4b04851 --- includes/site/SiteSQLStore.php | 4 +++- tests/phpunit/includes/site/SiteSQLStoreTest.php | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/includes/site/SiteSQLStore.php b/includes/site/SiteSQLStore.php index 8745cb4f76..46ce91d624 100644 --- a/includes/site/SiteSQLStore.php +++ b/includes/site/SiteSQLStore.php @@ -145,6 +145,8 @@ class SiteSQLStore implements SiteStore { $site->setGlobalId( $siteRow->getField( 'global_key' ) ); + $site->setInternalId( $siteRow->getField( 'id' ) ); + if ( $siteRow->hasField( 'forward' ) ) { $site->setForward( $siteRow->getField( 'forward' ) ); } @@ -406,4 +408,4 @@ class Sites extends SiteSQLStore { return $this->getSites()->getGroup( $group ); } -} \ No newline at end of file +} diff --git a/tests/phpunit/includes/site/SiteSQLStoreTest.php b/tests/phpunit/includes/site/SiteSQLStoreTest.php index 58a4e1fecb..0967108315 100644 --- a/tests/phpunit/includes/site/SiteSQLStoreTest.php +++ b/tests/phpunit/includes/site/SiteSQLStoreTest.php @@ -76,10 +76,14 @@ class SiteSQLStoreTest extends MediaWikiTestCase { $site = $sitesTable->getSite( 'ertrywuutr', 'nocache' ); $this->assertInstanceOf( 'Site', $site ); $this->assertEquals( 'en', $site->getLanguageCode() ); + $this->assertTrue( is_integer( $site->getInternalId() ) ); + $this->assertTrue( $site->getInternalId() >= 0 ); $site = $sitesTable->getSite( 'sdfhxujgkfpth', 'nocache' ); $this->assertInstanceOf( 'Site', $site ); $this->assertEquals( 'nl', $site->getLanguageCode() ); + $this->assertTrue( is_integer( $site->getInternalId() ) ); + $this->assertTrue( $site->getInternalId() >= 0 ); } } -- 2.20.1