(bug 44338) set the site internal id when loading sites from the db

Change-Id: Id0d76255e8f12ac7101b8334e3968cdbf4b04851

diff --git a/includes/site/SiteSQLStore.php b/includes/site/SiteSQLStore.php
index 8745cb4..46ce91d 100644 (file)
--- 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 58a4e1f..0967108 100644 (file)
--- 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 );
        }
 
 }