merged master some more

[lhc/web/wiklou.git] / includes / AutoLoader.php

diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 9c18ced..cb7432c 100644 (file)
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -293,6 +293,7 @@ $wgAutoloadLocalClasses = array(
        'AbstractContent' => 'includes/Content.php',
        'ContentHandler' => 'includes/ContentHandler.php',
        'CssContent' => 'includes/Content.php',
+       'TextContentHandler' => 'includes/ContentHandler.php',
        'CssContentHandler' => 'includes/ContentHandler.php',
        'JavaScriptContent' => 'includes/Content.php',
        'JavaScriptContentHandler' => 'includes/ContentHandler.php',
@@ -1021,6 +1022,8 @@ $wgAutoloadLocalClasses = array(
        'FakeConverter' => 'languages/Language.php',
        'Language' => 'languages/Language.php',
        'LanguageConverter' => 'languages/LanguageConverter.php',
+       'CLDRPluralRuleEvaluator' => 'languages/utils/CLDRPluralRuleEvaluator.php',
+       'CLDRPluralRuleError' => 'languages/utils/CLDRPluralRuleEvaluator.php',
 
        # maintenance
        'ConvertLinks' => 'maintenance/convertLinks.php',
@@ -1076,7 +1079,6 @@ $wgAutoloadLocalClasses = array(
        'JavascriptContentTest' => 'tests/phpunit/includes/JavascriptContentTest.php',
        'DummyContentHandlerForTesting' => 'tests/phpunit/includes/ContentHandlerTest.php',
        'DummyContentForTesting' => 'tests/phpunit/includes/ContentHandlerTest.php',
-
        # tests/phpunit/includes
        'GenericArrayObjectTest' => 'tests/phpunit/includes/libs/GenericArrayObjectTest.php',