Merge commit '1a365e'

4 files changed, 13 insertions, 1 deletions

diff --git a/tests/phpunit/data/media/80x60-2layers.xcf b/tests/phpunit/data/media/80x60-2layers.xcf
new file mode 100644
index 00000000..c51e980c
--- /dev/null
+++ b/tests/phpunit/data/media/80x60-2layers.xcf
diff --git a/tests/phpunit/data/media/80x60-Greyscale.xcf b/tests/phpunit/data/media/80x60-Greyscale.xcf
new file mode 100644
index 00000000..84bf3e67
--- /dev/null
+++ b/tests/phpunit/data/media/80x60-Greyscale.xcf
diff --git a/tests/phpunit/data/media/80x60-RGB.xcf b/tests/phpunit/data/media/80x60-RGB.xcf
new file mode 100644
index 00000000..1d58f16d
--- /dev/null
+++ b/tests/phpunit/data/media/80x60-RGB.xcf
diff --git a/tests/phpunit/includes/registration/ExtensionRegistryTest.php b/tests/phpunit/includes/registration/ExtensionRegistryTest.php
index 1b24628c..d7d4f198 100644
--- a/tests/phpunit/includes/registration/ExtensionRegistryTest.php
+++ b/tests/phpunit/includes/registration/ExtensionRegistryTest.php
@@ -189,7 +189,19 @@ class ExtensionRegistryTest extends MediaWikiTestCase {
 						)
 					),
 				),
-			)
+			),
+			array(
+				'False local setting should not be overridden (T100767)',
+				array(
+					'mwtestT100767' => false,
+				),
+				array(
+					'mwtestT100767' => true,
+				),
+				array(
+					'mwtestT100767' => false,
+				),
+			),
 		);
 	}
 }