3 files changed, 31 insertions, 0 deletions
diff --git a/phpBB/common.php b/phpBB/common.php
index 4b06cd1eda..e96a34938a 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -95,6 +95,8 @@ $phpbb_class_loader->register();
 $phpbb_class_loader_ext = new \phpbb\class_loader('\\', "{$phpbb_root_path}ext/", $phpEx);
 $phpbb_class_loader_ext->register();
 
+phpbb_load_extensions_autoloaders($phpbb_root_path);
+
 // Set up container
 $phpbb_container = phpbb_create_default_container($phpbb_root_path, $phpEx);
 
diff --git a/phpBB/download/file.php b/phpBB/download/file.php
index ce2855473b..f7636b0e1a 100644
--- a/phpBB/download/file.php
+++ b/phpBB/download/file.php
@@ -59,6 +59,8 @@ if (isset($_GET['avatar']))
 	$phpbb_class_loader_ext = new \phpbb\class_loader('\\', "{$phpbb_root_path}ext/", $phpEx);
 	$phpbb_class_loader_ext->register();
 
+	phpbb_load_extensions_autoloaders($phpbb_root_path);
+
 	// Set up container
 	$phpbb_container = phpbb_create_default_container($phpbb_root_path, $phpEx);
 
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 32acb0c9ff..f820679144 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -21,6 +21,33 @@ if (!defined('IN_PHPBB'))
 
 // Common global functions
 /**
+* Load the autoloaders added by the extensions.
+*
+* @param string $phpbb_root_path Path to the phpbb root directory.
+*/
+function phpbb_load_extensions_autoloaders($phpbb_root_path)
+{
+	$iterator = new \RecursiveIteratorIterator(
+		new \phpbb\recursive_dot_prefix_filter_iterator(
+			new \RecursiveDirectoryIterator(
+				$phpbb_root_path . 'ext/',
+				\FilesystemIterator::SKIP_DOTS
+			)
+		),
+		\RecursiveIteratorIterator::SELF_FIRST
+	);
+	$iterator->setMaxDepth(3);
+
+	foreach ($iterator as $file_info)
+	{
+		if ($file_info->getFilename() === 'autoload.php' && $file_info->getPathInfo()->getFilename() === 'vendor')
+		{
+			require $file_info->getRealPath();
+		}
+	}
+}
+
+/**
 * Casts a variable to the given type.
 *
 * @deprecated