| Index: trunk/extensions/Validator/Validator.php |
| — | — | @@ -52,7 +52,8 @@ |
| 53 | 53 | $wgAutoloadClasses['ParserHook'] = $incDir . 'ParserHook.php'; |
| 54 | 54 | $wgAutoloadClasses['Validator'] = $incDir . 'Validator.php'; |
| 55 | 55 | $wgAutoloadClasses['TopologicalSort'] = $incDir . 'TopologicalSort.php'; |
| 56 | | -$wgAutoloadClasses['ValidationError'] = $incDir . 'ValidationError.php'; |
| | 56 | +// No need to autoload this one, since it's directly included below. |
| | 57 | +//$wgAutoloadClasses['ValidationError'] = $incDir . 'ValidationError.php'; |
| 57 | 58 | $wgAutoloadClasses['ValidationErrorHandler'] = $incDir . 'ValidationErrorHandler.php'; |
| 58 | 59 | |
| 59 | 60 | $wgAutoloadClasses['CriterionHasLength'] = $incDir . 'criteria/CriterionHasLength.php'; |
| — | — | @@ -94,5 +95,8 @@ |
| 95 | 96 | return true; |
| 96 | 97 | } |
| 97 | 98 | |
| | 99 | +// This file needs to be included directly, since Validator_Settings.php |
| | 100 | +// uses it, in some rare cases before autoloading is defined. |
| | 101 | +require_once 'includes/ValidationError.php' ; |
| 98 | 102 | // Include the settings file. |
| 99 | | -require_once 'Validator_Settings.php'; |
| \ No newline at end of file |
| | 103 | +require_once 'Validator_Settings.php'; |