Merge "Actually try to load intl for test which requires it."

diff --git a/tests/phpunit/includes/CollationTest.php b/tests/phpunit/includes/CollationTest.php
index f1004fb..ae35fd7 100644 (file)
--- a/tests/phpunit/includes/CollationTest.php
+++ b/tests/phpunit/includes/CollationTest.php
@@ -2,7 +2,7 @@
 class CollationTest extends MediaWikiLangTestCase {
        protected function setUp() {
                parent::setUp();
-               if ( !extension_loaded( 'intl' ) ) {
+               if ( !wfDl( 'intl' ) ) {
                        $this->markTestSkipped( 'These tests require intl extension' );
                }
        }