Merge "registration: Only allow one extension to set a specific config setting"

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

diff --git a/includes/registration/ExtensionProcessor.php b/includes/registration/ExtensionProcessor.php
index 14d8222..5dc0b40 100644 (file)
--- a/includes/registration/ExtensionProcessor.php
+++ b/includes/registration/ExtensionProcessor.php
@@ -535,10 +535,7 @@ class ExtensionProcessor implements Processor {
        public function getExtraAutoloaderPaths( $dir, array $info ) {
                $paths = [];
                if ( isset( $info['load_composer_autoloader'] ) && $info['load_composer_autoloader'] === true ) {
        public function getExtraAutoloaderPaths( $dir, array $info ) {
                $paths = [];
                if ( isset( $info['load_composer_autoloader'] ) && $info['load_composer_autoloader'] === true ) {

-                       $path = "$dir/vendor/autoload.php";
-                       if ( file_exists( $path ) ) {
-                               $paths[] = $path;
-                       }
+                       $paths[] = "$dir/vendor/autoload.php";

                }
                return $paths;
        }
                }
                return $paths;
        }