Merge "Lazy-infuse OOUI widgets by tab"

diff --git a/maintenance/oracle/tables.sql b/maintenance/oracle/tables.sql
index c3f0717..6e76851 100644 (file)
--- a/maintenance/oracle/tables.sql
+++ b/maintenance/oracle/tables.sql
@@ -510,7 +510,7 @@ CREATE TABLE &mw_prefix.ipblocks (
   ipb_deleted           CHAR(1)      DEFAULT '0' NOT NULL,
   ipb_block_email       CHAR(1)      DEFAULT '0' NOT NULL,
   ipb_allow_usertalk    CHAR(1)      DEFAULT '0' NOT NULL,
-  ipb_parent_block_id             NUMBER       DEFAULT NULL
+  ipb_parent_block_id   NUMBER       DEFAULT NULL,
   ipb_sitewide          CHAR(1)      DEFAULT '1' NOT NULL
 );
 ALTER TABLE &mw_prefix.ipblocks ADD CONSTRAINT &mw_prefix.ipblocks_pk PRIMARY KEY (ipb_id);

diff --git a/tests/phpunit/includes/preferences/DefaultPreferencesFactoryTest.php b/tests/phpunit/includes/preferences/DefaultPreferencesFactoryTest.php
index 43c678e..2eec5ce 100644 (file)
--- a/tests/phpunit/includes/preferences/DefaultPreferencesFactoryTest.php
+++ b/tests/phpunit/includes/preferences/DefaultPreferencesFactoryTest.php
@@ -63,6 +63,8 @@ class DefaultPreferencesFactoryTest extends MediaWikiTestCase {
         * @covers MediaWiki\Preferences\DefaultPreferencesFactory::getForm()
         */
        public function testGetForm() {
+               $this->setTemporaryHook( 'GetPreferences', null );
+
                $testUser = $this->getTestUser();
                $form = $this->getPreferencesFactory()->getForm( $testUser->getUser(), $this->context );
                $this->assertInstanceOf( PreferencesFormLegacy::class, $form );