Merge "Add attributes parameter to ShowSearchHitTitle"

[lhc/web/wiklou.git] / includes / registration / ExtensionJsonValidator.php

diff --git a/includes/registration/ExtensionJsonValidator.php b/includes/registration/ExtensionJsonValidator.php
index f6e76af..c8e5e19 100644 (file)
--- a/includes/registration/ExtensionJsonValidator.php
+++ b/includes/registration/ExtensionJsonValidator.php
@@ -75,11 +75,7 @@ class ExtensionJsonValidator {
                }
 
                $version = $data->manifest_version;
-               if ( $version !== ExtensionRegistry::MANIFEST_VERSION ) {
-                       $schemaPath = __DIR__ . "/../../docs/extension.schema.v$version.json";
-               } else {
-                       $schemaPath = __DIR__ . '/../../docs/extension.schema.json';
-               }
+               $schemaPath = __DIR__ . "/../../docs/extension.schema.v$version.json";
 
                // Not too old
                if ( $version < ExtensionRegistry::OLDEST_MANIFEST_VERSION ) {
@@ -109,7 +105,7 @@ class ExtensionJsonValidator {
                        // All good.
                        return true;
                } else {
-                       $out = "$path did pass validation.\n";
+                       $out = "$path did not pass validation.\n";
                        foreach ( $validator->getErrors() as $error ) {
                                $out .= "[{$error['property']}] {$error['message']}\n";
                        }