From 1a365e77dfb8825136626202b1df462731b42060 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sun, 16 Aug 2015 08:22:05 +0200 Subject: Update to MediaWiki 1.25.2 --- tests/parser/preprocess/All_system_messages.expected | 14 -------------- tests/parser/preprocess/All_system_messages.txt | 14 -------------- tests/phpunit/data/media/80x60-2layers.xcf | Bin 0 -> 1162 bytes tests/phpunit/data/media/80x60-Greyscale.xcf | Bin 0 -> 667 bytes tests/phpunit/data/media/80x60-RGB.xcf | Bin 0 -> 677 bytes .../includes/registration/ExtensionRegistryTest.php | 14 +++++++++++++- 6 files changed, 13 insertions(+), 29 deletions(-) create mode 100644 tests/phpunit/data/media/80x60-2layers.xcf create mode 100644 tests/phpunit/data/media/80x60-Greyscale.xcf create mode 100644 tests/phpunit/data/media/80x60-RGB.xcf (limited to 'tests') diff --git a/tests/parser/preprocess/All_system_messages.expected b/tests/parser/preprocess/All_system_messages.expected index 2ee805e0..3665e3c1 100644 --- a/tests/parser/preprocess/All_system_messages.expected +++ b/tests/parser/preprocess/All_system_messages.expected @@ -3193,13 +3193,6 @@ About </td><td> </td></tr><tr><td> -[http://tl.wiktionary.org/w/wiki.phtml?title=MediaWiki:Nviews&action=edit nviews]<br> -[[MediaWiki_talk:Nviews|Talk]] -</td><td> -$1 views -</td><td> - -</td></tr><tr><td> [http://tl.wiktionary.org/w/wiki.phtml?title=MediaWiki:Ok&action=edit ok]<br> [[MediaWiki_talk:Ok|Talk]] </td><td> @@ -3319,13 +3312,6 @@ Personal tools </td><td> </td></tr><tr><td> -[http://tl.wiktionary.org/w/wiki.phtml?title=MediaWiki:Popularpages&action=edit popularpages]<br> -[[MediaWiki_talk:Popularpages|Talk]] -</td><td> -Popular pages -</td><td> - -</td></tr><tr><td> [http://tl.wiktionary.org/w/wiki.phtml?title=MediaWiki:Portal&action=edit portal]<br> [[MediaWiki_talk:Portal|Talk]] </td><td> diff --git a/tests/parser/preprocess/All_system_messages.txt b/tests/parser/preprocess/All_system_messages.txt index 4a30f56f..c619df7b 100644 --- a/tests/parser/preprocess/All_system_messages.txt +++ b/tests/parser/preprocess/All_system_messages.txt @@ -3193,13 +3193,6 @@ About {{int:Nstab-wp}} -[http://tl.wiktionary.org/w/wiki.phtml?title=MediaWiki:Nviews&action=edit nviews]
-[[MediaWiki_talk:Nviews|Talk]] - -$1 views - -{{int:Nviews}} - [http://tl.wiktionary.org/w/wiki.phtml?title=MediaWiki:Ok&action=edit ok]
[[MediaWiki_talk:Ok|Talk]] @@ -3319,13 +3312,6 @@ Personal tools {{int:Personaltools}} -[http://tl.wiktionary.org/w/wiki.phtml?title=MediaWiki:Popularpages&action=edit popularpages]
-[[MediaWiki_talk:Popularpages|Talk]] - -Popular pages - -{{int:Popularpages}} - [http://tl.wiktionary.org/w/wiki.phtml?title=MediaWiki:Portal&action=edit portal]
[[MediaWiki_talk:Portal|Talk]] 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 Binary files /dev/null and b/tests/phpunit/data/media/80x60-2layers.xcf differ 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 Binary files /dev/null and b/tests/phpunit/data/media/80x60-Greyscale.xcf differ 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 Binary files /dev/null and b/tests/phpunit/data/media/80x60-RGB.xcf differ 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, + ), + ), ); } } -- cgit v1.2.2