251 files changed, 15 insertions, 20 deletions
diff --git a/phpBB/common.php b/phpBB/common.php
index f6f109c3de..962a1f951f 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -46,7 +46,7 @@ if (!defined('PHPBB_INSTALLED'))
 	$script_path = preg_replace('#[\\\\/]{2,}#', '/', $script_path);
 
 	// Eliminate . and .. from the path
-	require($phpbb_root_path . 'includes/filesystem.' . $phpEx);
+	require($phpbb_root_path . 'phpbb/filesystem.' . $phpEx);
 	$phpbb_filesystem = new phpbb_filesystem();
 	$script_path = $phpbb_filesystem->clean_path($script_path);
 
@@ -71,7 +71,7 @@ $phpbb_adm_relative_path = (isset($phpbb_adm_relative_path)) ? $phpbb_adm_relati
 $phpbb_admin_path = (defined('PHPBB_ADMIN_PATH')) ? PHPBB_ADMIN_PATH : $phpbb_root_path . $phpbb_adm_relative_path;
 
 // Include files
-require($phpbb_root_path . 'includes/class_loader.' . $phpEx);
+require($phpbb_root_path . 'phpbb/class_loader.' . $phpEx);
 
 require($phpbb_root_path . 'includes/functions.' . $phpEx);
 require($phpbb_root_path . 'includes/functions_content.' . $phpEx);
@@ -85,7 +85,7 @@ require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
 set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler');
 
 // Setup class loader first
-$phpbb_class_loader = new phpbb_class_loader('phpbb_', "{$phpbb_root_path}includes/", $phpEx);
+$phpbb_class_loader = new phpbb_class_loader('phpbb_', "{$phpbb_root_path}phpbb/", $phpEx);
 $phpbb_class_loader->register();
 $phpbb_class_loader_ext = new phpbb_class_loader('phpbb_ext_', "{$phpbb_root_path}ext/", $phpEx);
 $phpbb_class_loader_ext->register();
diff --git a/phpBB/includes/acp/acp_search.php b/phpBB/includes/acp/acp_search.php
index 6618e2c3f9..11a2511aee 100644
--- a/phpBB/includes/acp/acp_search.php
+++ b/phpBB/includes/acp/acp_search.php
@@ -560,7 +560,7 @@ class acp_search
 		return $finder
 			->extension_suffix('_backend')
 			->extension_directory('/search')
-			->core_path('includes/search/')
+			->core_path('phpbb/search/')
 			->get_classes();
 	}
 
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index b20ca1e4ea..cd6fb7931b 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -82,7 +82,7 @@ $phpbb_adm_relative_path = (isset($phpbb_adm_relative_path)) ? $phpbb_adm_relati
 $phpbb_admin_path = (defined('PHPBB_ADMIN_PATH')) ? PHPBB_ADMIN_PATH : $phpbb_root_path . $phpbb_adm_relative_path;
 
 // Include files
-require($phpbb_root_path . 'includes/class_loader.' . $phpEx);
+require($phpbb_root_path . 'phpbb/class_loader.' . $phpEx);
 
 require($phpbb_root_path . 'includes/functions.' . $phpEx);
 require($phpbb_root_path . 'includes/functions_content.' . $phpEx);
@@ -95,7 +95,7 @@ require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
 set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler');
 
 // Setup class loader first
-$phpbb_class_loader = new phpbb_class_loader('phpbb_', "{$phpbb_root_path}includes/", $phpEx);
+$phpbb_class_loader = new phpbb_class_loader('phpbb_', "{$phpbb_root_path}phpbb/", $phpEx);
 $phpbb_class_loader->register();
 
 // Set up container (must be done here because extensions table may not exist)
@@ -217,7 +217,7 @@ $phpbb_extension_manager = $phpbb_container->get('ext.manager');
 $finder = $phpbb_extension_manager->get_finder();
 
 $migrations = $finder
-	->core_path('includes/db/migration/data/')
+	->core_path('phpbb/db/migration/data/')
 	->get_classes();
 $migrator->set_migrations($migrations);
 
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 84a2a023f8..45e5777e36 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -78,7 +78,7 @@ $phpbb_adm_relative_path = (isset($phpbb_adm_relative_path)) ? $phpbb_adm_relati
 $phpbb_admin_path = (defined('PHPBB_ADMIN_PATH')) ? PHPBB_ADMIN_PATH : $phpbb_root_path . $phpbb_adm_relative_path;
 
 // Include essential scripts
-require($phpbb_root_path . 'includes/class_loader.' . $phpEx);
+require($phpbb_root_path . 'phpbb/class_loader.' . $phpEx);
 
 require($phpbb_root_path . 'includes/functions.' . $phpEx);
 require($phpbb_root_path . 'includes/functions_container.' . $phpEx);
@@ -90,7 +90,7 @@ include($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
 require($phpbb_root_path . 'includes/functions_install.' . $phpEx);
 
 // Setup class loader first
-$phpbb_class_loader = new phpbb_class_loader('phpbb_', "{$phpbb_root_path}includes/", $phpEx);
+$phpbb_class_loader = new phpbb_class_loader('phpbb_', "{$phpbb_root_path}phpbb/", $phpEx);
 $phpbb_class_loader->register();
 $phpbb_class_loader_ext = new phpbb_class_loader('phpbb_ext_', "{$phpbb_root_path}ext/", $phpEx);
 $phpbb_class_loader_ext->register();
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index 3d7b6f7c88..ea23c318e3 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -1435,7 +1435,7 @@ class install_install extends module
 		$db->sql_return_on_error(true);
 
 		include_once($phpbb_root_path . 'includes/constants.' . $phpEx);
-		include_once($phpbb_root_path . 'includes/search/fulltext_native.' . $phpEx);
+		include_once($phpbb_root_path . 'phpbb/search/fulltext_native.' . $phpEx);
 
 		// We need to fill the config to let internal functions correctly work
 		$config = new phpbb_config_db($db, new phpbb_cache_driver_null, CONFIG_TABLE);
@@ -1888,7 +1888,7 @@ class install_install extends module
 	/**
 	* Populate migrations for the installation
 	*
-	* This "installs" all migrations from (root path)/includes/db/migrations/data.
+	* This "installs" all migrations from (root path)/phpbb/db/migrations/data.
 	* "installs" means it adds all migrations to the migrations table, but does not
 	* perform any of the actions in the migrations.
 	*
@@ -1900,7 +1900,7 @@ class install_install extends module
 		$finder = $extension_manager->get_finder();
 
 		$migrations = $finder
-			->core_path('includes/db/migration/data/')
+			->core_path('phpbb/db/migration/data/')
 			->get_classes();
 		$migrator->populate_migrations($migrations);
 	}
diff --git a/phpBB/includes/auth/auth.php b/phpBB/phpbb/auth/auth.php
index 279959974d..279959974d 100644
--- a/phpBB/includes/auth/auth.php
+++ b/phpBB/phpbb/auth/auth.php
diff --git a/phpBB/includes/auth/index.htm b/phpBB/phpbb/auth/index.htm
index ee1f723a7d..ee1f723a7d 100644
--- a/phpBB/includes/auth/index.htm
+++ b/phpBB/phpbb/auth/index.htm
diff --git a/phpBB/includes/auth/provider/apache.php b/phpBB/phpbb/auth/provider/apache.php
index 2e80436f78..2e80436f78 100644
--- a/phpBB/includes/auth/provider/apache.php
+++ b/phpBB/phpbb/auth/provider/apache.php
diff --git a/phpBB/includes/auth/provider/base.php b/phpBB/phpbb/auth/provider/base.php
index 7eaf8bb2d3..7eaf8bb2d3 100644
--- a/phpBB/includes/auth/provider/base.php
+++ b/phpBB/phpbb/auth/provider/base.php
diff --git a/phpBB/includes/auth/provider/db.php b/phpBB/phpbb/auth/provider/db.php
index 0934c56d9b..0934c56d9b 100644
--- a/phpBB/includes/auth/provider/db.php
+++ b/phpBB/phpbb/auth/provider/db.php
diff --git a/phpBB/includes/auth/provider/index.htm b/phpBB/phpbb/auth/provider/index.htm
index ee1f723a7d..ee1f723a7d 100644
--- a/phpBB/includes/auth/provider/index.htm
+++ b/phpBB/phpbb/auth/provider/index.htm
diff --git a/phpBB/includes/auth/provider/interface.php b/phpBB/phpbb/auth/provider/interface.php
index 47043bc107..47043bc107 100644
--- a/phpBB/includes/auth/provider/interface.php
+++ b/phpBB/phpbb/auth/provider/interface.php
diff --git a/phpBB/includes/auth/provider/ldap.php b/phpBB/phpbb/auth/provider/ldap.php
index 0196529408..0196529408 100644
--- a/phpBB/includes/auth/provider/ldap.php
+++ b/phpBB/phpbb/auth/provider/ldap.php
diff --git a/phpBB/includes/avatar/driver/driver.php b/phpBB/phpbb/avatar/driver/driver.php
index 29c58d4e62..29c58d4e62 100644
--- a/phpBB/includes/avatar/driver/driver.php
+++ b/phpBB/phpbb/avatar/driver/driver.php
diff --git a/phpBB/includes/avatar/driver/gravatar.php b/phpBB/phpbb/avatar/driver/gravatar.php
index d559da1c0d..d559da1c0d 100644
--- a/phpBB/includes/avatar/driver/gravatar.php
+++ b/phpBB/phpbb/avatar/driver/gravatar.php
diff --git a/phpBB/includes/avatar/driver/interface.php b/phpBB/phpbb/avatar/driver/interface.php
index 3d62969aef..3d62969aef 100644
--- a/phpBB/includes/avatar/driver/interface.php
+++ b/phpBB/phpbb/avatar/driver/interface.php
diff --git a/phpBB/includes/avatar/driver/local.php b/phpBB/phpbb/avatar/driver/local.php
index f4bcd4ce74..f4bcd4ce74 100644
--- a/phpBB/includes/avatar/driver/local.php
+++ b/phpBB/phpbb/avatar/driver/local.php
diff --git a/phpBB/includes/avatar/driver/remote.php b/phpBB/phpbb/avatar/driver/remote.php
index 7da58107a1..7da58107a1 100644
--- a/phpBB/includes/avatar/driver/remote.php
+++ b/phpBB/phpbb/avatar/driver/remote.php
diff --git a/phpBB/includes/avatar/driver/upload.php b/phpBB/phpbb/avatar/driver/upload.php
index 685ac4f349..685ac4f349 100644
--- a/phpBB/includes/avatar/driver/upload.php
+++ b/phpBB/phpbb/avatar/driver/upload.php
diff --git a/phpBB/includes/avatar/manager.php b/phpBB/phpbb/avatar/manager.php
index 58d994c3c0..58d994c3c0 100644
--- a/phpBB/includes/avatar/manager.php
+++ b/phpBB/phpbb/avatar/manager.php
diff --git a/phpBB/includes/cache/driver/apc.php b/phpBB/phpbb/cache/driver/apc.php
index 0516b669c8..0516b669c8 100644
--- a/phpBB/includes/cache/driver/apc.php
+++ b/phpBB/phpbb/cache/driver/apc.php
diff --git a/phpBB/includes/cache/driver/base.php b/phpBB/phpbb/cache/driver/base.php
index 32e04f813a..32e04f813a 100644
--- a/phpBB/includes/cache/driver/base.php
+++ b/phpBB/phpbb/cache/driver/base.php
diff --git a/phpBB/includes/cache/driver/eaccelerator.php b/phpBB/phpbb/cache/driver/eaccelerator.php
index 257b90c76e..257b90c76e 100644
--- a/phpBB/includes/cache/driver/eaccelerator.php
+++ b/phpBB/phpbb/cache/driver/eaccelerator.php
diff --git a/phpBB/includes/cache/driver/file.php b/phpBB/phpbb/cache/driver/file.php
index 85decbe3e8..85decbe3e8 100644
--- a/phpBB/includes/cache/driver/file.php
+++ b/phpBB/phpbb/cache/driver/file.php
diff --git a/phpBB/includes/cache/driver/interface.php b/phpBB/phpbb/cache/driver/interface.php
index 53f684d1c8..53f684d1c8 100644
--- a/phpBB/includes/cache/driver/interface.php
+++ b/phpBB/phpbb/cache/driver/interface.php
diff --git a/phpBB/includes/cache/driver/memcache.php b/phpBB/phpbb/cache/driver/memcache.php
index 3fd16b23b0..3fd16b23b0 100644
--- a/phpBB/includes/cache/driver/memcache.php
+++ b/phpBB/phpbb/cache/driver/memcache.php
diff --git a/phpBB/includes/cache/driver/memory.php b/phpBB/phpbb/cache/driver/memory.php
index f77a1df316..f77a1df316 100644
--- a/phpBB/includes/cache/driver/memory.php
+++ b/phpBB/phpbb/cache/driver/memory.php
diff --git a/phpBB/includes/cache/driver/null.php b/phpBB/phpbb/cache/driver/null.php
index 2fadc27ba3..2fadc27ba3 100644
--- a/phpBB/includes/cache/driver/null.php
+++ b/phpBB/phpbb/cache/driver/null.php
diff --git a/phpBB/includes/cache/driver/redis.php b/phpBB/phpbb/cache/driver/redis.php
index 960735b673..960735b673 100644
--- a/phpBB/includes/cache/driver/redis.php
+++ b/phpBB/phpbb/cache/driver/redis.php
diff --git a/phpBB/includes/cache/driver/wincache.php b/phpBB/phpbb/cache/driver/wincache.php
index 58f3b4a581..58f3b4a581 100644
--- a/phpBB/includes/cache/driver/wincache.php
+++ b/phpBB/phpbb/cache/driver/wincache.php
diff --git a/phpBB/includes/cache/driver/xcache.php b/phpBB/phpbb/cache/driver/xcache.php
index 06c5fafd97..06c5fafd97 100644
--- a/phpBB/includes/cache/driver/xcache.php
+++ b/phpBB/phpbb/cache/driver/xcache.php
diff --git a/phpBB/includes/cache/service.php b/phpBB/phpbb/cache/service.php
index 69c5e0fdd0..69c5e0fdd0 100644
--- a/phpBB/includes/cache/service.php
+++ b/phpBB/phpbb/cache/service.php
diff --git a/phpBB/includes/class_loader.php b/phpBB/phpbb/class_loader.php
index 02a2d584dc..02a2d584dc 100644
--- a/phpBB/includes/class_loader.php
+++ b/phpBB/phpbb/class_loader.php
diff --git a/phpBB/includes/config/config.php b/phpBB/phpbb/config/config.php
index 4b533dd55c..4b533dd55c 100644
--- a/phpBB/includes/config/config.php
+++ b/phpBB/phpbb/config/config.php
diff --git a/phpBB/includes/config/db.php b/phpBB/phpbb/config/db.php
index b18369a479..b18369a479 100644
--- a/phpBB/includes/config/db.php
+++ b/phpBB/phpbb/config/db.php
diff --git a/phpBB/includes/config/db_text.php b/phpBB/phpbb/config/db_text.php
index b365cb5c77..b365cb5c77 100644
--- a/phpBB/includes/config/db_text.php
+++ b/phpBB/phpbb/config/db_text.php
diff --git a/phpBB/includes/content_visibility.php b/phpBB/phpbb/content_visibility.php
index 4ad5f6793e..4ad5f6793e 100644
--- a/phpBB/includes/content_visibility.php
+++ b/phpBB/phpbb/content_visibility.php
diff --git a/phpBB/includes/controller/exception.php b/phpBB/phpbb/controller/exception.php
index faa8b6b584..faa8b6b584 100644
--- a/phpBB/includes/controller/exception.php
+++ b/phpBB/phpbb/controller/exception.php
diff --git a/phpBB/includes/controller/helper.php b/phpBB/phpbb/controller/helper.php
index 74410ddfd1..74410ddfd1 100644
--- a/phpBB/includes/controller/helper.php
+++ b/phpBB/phpbb/controller/helper.php
diff --git a/phpBB/includes/controller/provider.php b/phpBB/phpbb/controller/provider.php
index b2a5b9f6b2..b2a5b9f6b2 100644
--- a/phpBB/includes/controller/provider.php
+++ b/phpBB/phpbb/controller/provider.php
diff --git a/phpBB/includes/controller/resolver.php b/phpBB/phpbb/controller/resolver.php
index 95dfc8da8e..95dfc8da8e 100644
--- a/phpBB/includes/controller/resolver.php
+++ b/phpBB/phpbb/controller/resolver.php
diff --git a/phpBB/includes/cron/manager.php b/phpBB/phpbb/cron/manager.php
index 84c9650830..84c9650830 100644
--- a/phpBB/includes/cron/manager.php
+++ b/phpBB/phpbb/cron/manager.php
diff --git a/phpBB/includes/cron/task/base.php b/phpBB/phpbb/cron/task/base.php
index 94a2f267b4..94a2f267b4 100644
--- a/phpBB/includes/cron/task/base.php
+++ b/phpBB/phpbb/cron/task/base.php
diff --git a/phpBB/includes/cron/task/core/prune_all_forums.php b/phpBB/phpbb/cron/task/core/prune_all_forums.php
index 2c5d38cec0..2c5d38cec0 100644
--- a/phpBB/includes/cron/task/core/prune_all_forums.php
+++ b/phpBB/phpbb/cron/task/core/prune_all_forums.php
diff --git a/phpBB/includes/cron/task/core/prune_forum.php b/phpBB/phpbb/cron/task/core/prune_forum.php
index e3c497f072..e3c497f072 100644
--- a/phpBB/includes/cron/task/core/prune_forum.php
+++ b/phpBB/phpbb/cron/task/core/prune_forum.php
diff --git a/phpBB/includes/cron/task/core/queue.php b/phpBB/phpbb/cron/task/core/queue.php
index 732f9c6bea..732f9c6bea 100644
--- a/phpBB/includes/cron/task/core/queue.php
+++ b/phpBB/phpbb/cron/task/core/queue.php
diff --git a/phpBB/includes/cron/task/core/tidy_cache.php b/phpBB/phpbb/cron/task/core/tidy_cache.php
index 16a45dae7c..16a45dae7c 100644
--- a/phpBB/includes/cron/task/core/tidy_cache.php
+++ b/phpBB/phpbb/cron/task/core/tidy_cache.php
diff --git a/phpBB/includes/cron/task/core/tidy_database.php b/phpBB/phpbb/cron/task/core/tidy_database.php
index b882e7b500..b882e7b500 100644
--- a/phpBB/includes/cron/task/core/tidy_database.php
+++ b/phpBB/phpbb/cron/task/core/tidy_database.php
diff --git a/phpBB/includes/cron/task/core/tidy_search.php b/phpBB/phpbb/cron/task/core/tidy_search.php
index 3ec25aa021..a3d5b7dbd2 100644
--- a/phpBB/includes/cron/task/core/tidy_search.php
+++ b/phpBB/phpbb/cron/task/core/tidy_search.php
@@ -61,11 +61,6 @@ class phpbb_cron_task_core_tidy_search extends phpbb_cron_task_base
 		// Select the search method
 		$search_type = basename($this->config['search_type']);
 
-		if (!class_exists($search_type))
-		{
-			include($this->phpbb_root_path . "includes/search/$search_type." . $this->php_ext);
-		}
-
 		// We do some additional checks in the module to ensure it can actually be utilised
 		$error = false;
 		$search = new $search_type($error, $this->phpbb_root_path, $this->php_ext, $this->auth, $this->config, $this->db, $this->user);
@@ -90,7 +85,7 @@ class phpbb_cron_task_core_tidy_search extends phpbb_cron_task_base
 		// Select the search method
 		$search_type = basename($this->config['search_type']);
 
-		return file_exists($this->phpbb_root_path . 'includes/search/' . $search_type . '.' . $this->php_ext);
+		return class_exists($search_type);
 	}
 
 	/**
diff --git a/phpBB/includes/cron/task/core/tidy_sessions.php b/phpBB/phpbb/cron/task/core/tidy_sessions.php
index 95f55235c9..95f55235c9 100644
--- a/phpBB/includes/cron/task/core/tidy_sessions.php
+++ b/phpBB/phpbb/cron/task/core/tidy_sessions.php
diff --git a/phpBB/includes/cron/task/core/tidy_warnings.php b/phpBB/phpbb/cron/task/core/tidy_warnings.php
index 2a7798e56e..2a7798e56e 100644
--- a/phpBB/includes/cron/task/core/tidy_warnings.php
+++ b/phpBB/phpbb/cron/task/core/tidy_warnings.php
diff --git a/phpBB/includes/cron/task/parametrized.php b/phpBB/phpbb/cron/task/parametrized.php
index 5f0e46eafc..5f0e46eafc 100644
--- a/phpBB/includes/cron/task/parametrized.php
+++ b/phpBB/phpbb/cron/task/parametrized.php
diff --git a/phpBB/includes/cron/task/task.php b/phpBB/phpbb/cron/task/task.php
index 2d585df96d..2d585df96d 100644
--- a/phpBB/includes/cron/task/task.php
+++ b/phpBB/phpbb/cron/task/task.php
diff --git a/phpBB/includes/cron/task/wrapper.php b/phpBB/phpbb/cron/task/wrapper.php
index 386fb5b383..386fb5b383 100644
--- a/phpBB/includes/cron/task/wrapper.php
+++ b/phpBB/phpbb/cron/task/wrapper.php
diff --git a/phpBB/includes/datetime.php b/phpBB/phpbb/datetime.php
index 3c6d4971b9..3c6d4971b9 100644
--- a/phpBB/includes/datetime.php
+++ b/phpBB/phpbb/datetime.php
diff --git a/phpBB/includes/db/driver/driver.php b/phpBB/phpbb/db/driver/driver.php
index 08c966c07a..08c966c07a 100644
--- a/phpBB/includes/db/driver/driver.php
+++ b/phpBB/phpbb/db/driver/driver.php
diff --git a/phpBB/includes/db/driver/firebird.php b/phpBB/phpbb/db/driver/firebird.php
index 787c28b812..787c28b812 100644
--- a/phpBB/includes/db/driver/firebird.php
+++ b/phpBB/phpbb/db/driver/firebird.php
diff --git a/phpBB/includes/db/driver/mssql.php b/phpBB/phpbb/db/driver/mssql.php
index 89c2c2351b..89c2c2351b 100644
--- a/phpBB/includes/db/driver/mssql.php
+++ b/phpBB/phpbb/db/driver/mssql.php
diff --git a/phpBB/includes/db/driver/mssql_base.php b/phpBB/phpbb/db/driver/mssql_base.php
index 56c111c871..56c111c871 100644
--- a/phpBB/includes/db/driver/mssql_base.php
+++ b/phpBB/phpbb/db/driver/mssql_base.php
diff --git a/phpBB/includes/db/driver/mssql_odbc.php b/phpBB/phpbb/db/driver/mssql_odbc.php
index a1d1a5d5dd..a1d1a5d5dd 100644
--- a/phpBB/includes/db/driver/mssql_odbc.php
+++ b/phpBB/phpbb/db/driver/mssql_odbc.php
diff --git a/phpBB/includes/db/driver/mssqlnative.php b/phpBB/phpbb/db/driver/mssqlnative.php
index 28fc88298a..28fc88298a 100644
--- a/phpBB/includes/db/driver/mssqlnative.php
+++ b/phpBB/phpbb/db/driver/mssqlnative.php
diff --git a/phpBB/includes/db/driver/mysql.php b/phpBB/phpbb/db/driver/mysql.php
index f3744ac09d..f3744ac09d 100644
--- a/phpBB/includes/db/driver/mysql.php
+++ b/phpBB/phpbb/db/driver/mysql.php
diff --git a/phpBB/includes/db/driver/mysql_base.php b/phpBB/phpbb/db/driver/mysql_base.php
index ba44ea61aa..ba44ea61aa 100644
--- a/phpBB/includes/db/driver/mysql_base.php
+++ b/phpBB/phpbb/db/driver/mysql_base.php
diff --git a/phpBB/includes/db/driver/mysqli.php b/phpBB/phpbb/db/driver/mysqli.php
index 0f7a73ee6e..0f7a73ee6e 100644
--- a/phpBB/includes/db/driver/mysqli.php
+++ b/phpBB/phpbb/db/driver/mysqli.php
diff --git a/phpBB/includes/db/driver/oracle.php b/phpBB/phpbb/db/driver/oracle.php
index e21e07055d..e21e07055d 100644
--- a/phpBB/includes/db/driver/oracle.php
+++ b/phpBB/phpbb/db/driver/oracle.php
diff --git a/phpBB/includes/db/driver/postgres.php b/phpBB/phpbb/db/driver/postgres.php
index 14854d179d..14854d179d 100644
--- a/phpBB/includes/db/driver/postgres.php
+++ b/phpBB/phpbb/db/driver/postgres.php
diff --git a/phpBB/includes/db/driver/sqlite.php b/phpBB/phpbb/db/driver/sqlite.php
index 7188f0daa2..7188f0daa2 100644
--- a/phpBB/includes/db/driver/sqlite.php
+++ b/phpBB/phpbb/db/driver/sqlite.php
diff --git a/phpBB/includes/db/migration/data/30x/3_0_1.php b/phpBB/phpbb/db/migration/data/30x/3_0_1.php
index c996a0138a..c996a0138a 100644
--- a/phpBB/includes/db/migration/data/30x/3_0_1.php
+++ b/phpBB/phpbb/db/migration/data/30x/3_0_1.php
diff --git a/phpBB/includes/db/migration/data/30x/3_0_10.php b/phpBB/phpbb/db/migration/data/30x/3_0_10.php
index 122f93d6b4..122f93d6b4 100644
--- a/phpBB/includes/db/migration/data/30x/3_0_10.php
+++ b/phpBB/phpbb/db/migration/data/30x/3_0_10.php
diff --git a/phpBB/includes/db/migration/data/30x/3_0_10_rc1.php b/phpBB/phpbb/db/migration/data/30x/3_0_10_rc1.php
index 0ed05812dc..0ed05812dc 100644
--- a/phpBB/includes/db/migration/data/30x/3_0_10_rc1.php
+++ b/phpBB/phpbb/db/migration/data/30x/3_0_10_rc1.php
diff --git a/phpBB/includes/db/migration/data/30x/3_0_10_rc2.php b/phpBB/phpbb/db/migration/data/30x/3_0_10_rc2.php
index b14b3b00aa..b14b3b00aa 100644
--- a/phpBB/includes/db/migration/data/30x/3_0_10_rc2.php
+++ b/phpBB/phpbb/db/migration/data/30x/3_0_10_rc2.php
diff --git a/phpBB/includes/db/migration/data/30x/3_0_10_rc3.php b/phpBB/phpbb/db/migration/data/30x/3_0_10_rc3.php
index 473057d65d..473057d65d 100644
--- a/phpBB/includes/db/migration/data/30x/3_0_10_rc3.php
+++ b/phpBB/phpbb/db/migration/data/30x/3_0_10_rc3.php
diff --git a/phpBB/includes/db/migration/data/30x/3_0_11.php b/phpBB/phpbb/db/migration/data/30x/3_0_11.php
index e063c699cc..e063c699cc 100644
--- a/phpBB/includes/db/migration/data/30x/3_0_11.php
+++ b/phpBB/phpbb/db/migration/data/30x/3_0_11.php
diff --git a/phpBB/includes/db/migration/data/30x/3_0_11_rc1.php b/phpBB/phpbb/db/migration/data/30x/3_0_11_rc1.php
index dddfc0e0e7..dddfc0e0e7 100644
--- a/phpBB/includes/db/migration/data/30x/3_0_11_rc1.php
+++ b/phpBB/phpbb/db/migration/data/30x/3_0_11_rc1.php
diff --git a/phpBB/includes/db/migration/data/30x/3_0_11_rc2.php b/phpBB/phpbb/db/migration/data/30x/3_0_11_rc2.php
index fac8523e8c..fac8523e8c 100644
--- a/phpBB/includes/db/migration/data/30x/3_0_11_rc2.php
+++ b/phpBB/phpbb/db/migration/data/30x/3_0_11_rc2.php
diff --git a/phpBB/includes/db/migration/data/30x/3_0_12_rc1.php b/phpBB/phpbb/db/migration/data/30x/3_0_12_rc1.php
index 6a31a51201..6a31a51201 100644
--- a/phpBB/includes/db/migration/data/30x/3_0_12_rc1.php
+++ b/phpBB/phpbb/db/migration/data/30x/3_0_12_rc1.php
diff --git a/phpBB/includes/db/migration/data/30x/3_0_1_rc1.php b/phpBB/phpbb/db/migration/data/30x/3_0_1_rc1.php
index 562ccf077c..562ccf077c 100644
--- a/phpBB/includes/db/migration/data/30x/3_0_1_rc1.php
+++ b/phpBB/phpbb/db/migration/data/30x/3_0_1_rc1.php
diff --git a/phpBB/includes/db/migration/data/30x/3_0_2.php b/phpBB/phpbb/db/migration/data/30x/3_0_2.php
index eed5acef82..eed5acef82 100644
--- a/phpBB/includes/db/migration/data/30x/3_0_2.php
+++ b/phpBB/phpbb/db/migration/data/30x/3_0_2.php
diff --git a/phpBB/includes/db/migration/data/30x/3_0_2_rc1.php b/phpBB/phpbb/db/migration/data/30x/3_0_2_rc1.php
index a960e90765..a960e90765 100644
--- a/phpBB/includes/db/migration/data/30x/3_0_2_rc1.php
+++ b/phpBB/phpbb/db/migration/data/30x/3_0_2_rc1.php
diff --git a/phpBB/includes/db/migration/data/30x/3_0_2_rc2.php b/phpBB/phpbb/db/migration/data/30x/3_0_2_rc2.php
index 8917dfea77..8917dfea77 100644
--- a/phpBB/includes/db/migration/data/30x/3_0_2_rc2.php
+++ b/phpBB/phpbb/db/migration/data/30x/3_0_2_rc2.php
diff --git a/phpBB/includes/db/migration/data/30x/3_0_3.php b/phpBB/phpbb/db/migration/data/30x/3_0_3.php
index 8984cf7b76..8984cf7b76 100644
--- a/phpBB/includes/db/migration/data/30x/3_0_3.php
+++ b/phpBB/phpbb/db/migration/data/30x/3_0_3.php
diff --git a/phpBB/includes/db/migration/data/30x/3_0_3_rc1.php b/phpBB/phpbb/db/migration/data/30x/3_0_3_rc1.php
index 4b102e1a2e..4b102e1a2e 100644
--- a/phpBB/includes/db/migration/data/30x/3_0_3_rc1.php
+++ b/phpBB/phpbb/db/migration/data/30x/3_0_3_rc1.php
diff --git a/phpBB/includes/db/migration/data/30x/3_0_4.php b/phpBB/phpbb/db/migration/data/30x/3_0_4.php
index 9a0c132e78..9a0c132e78 100644
--- a/phpBB/includes/db/migration/data/30x/3_0_4.php
+++ b/phpBB/phpbb/db/migration/data/30x/3_0_4.php
diff --git a/phpBB/includes/db/migration/data/30x/3_0_4_rc1.php b/phpBB/phpbb/db/migration/data/30x/3_0_4_rc1.php
index 8ad75a557b..8ad75a557b 100644
--- a/phpBB/includes/db/migration/data/30x/3_0_4_rc1.php
+++ b/phpBB/phpbb/db/migration/data/30x/3_0_4_rc1.php
diff --git a/phpBB/includes/db/migration/data/30x/3_0_5.php b/phpBB/phpbb/db/migration/data/30x/3_0_5.php
index 16d2dee457..16d2dee457 100644
--- a/phpBB/includes/db/migration/data/30x/3_0_5.php
+++ b/phpBB/phpbb/db/migration/data/30x/3_0_5.php
diff --git a/phpBB/includes/db/migration/data/30x/3_0_5_rc1.php b/phpBB/phpbb/db/migration/data/30x/3_0_5_rc1.php
index ea17cc1e31..ea17cc1e31 100644
--- a/phpBB/includes/db/migration/data/30x/3_0_5_rc1.php
+++ b/phpBB/phpbb/db/migration/data/30x/3_0_5_rc1.php
diff --git a/phpBB/includes/db/migration/data/30x/3_0_5_rc1part2.php b/phpBB/phpbb/db/migration/data/30x/3_0_5_rc1part2.php
index 8538347b1a..8538347b1a 100644
--- a/phpBB/includes/db/migration/data/30x/3_0_5_rc1part2.php
+++ b/phpBB/phpbb/db/migration/data/30x/3_0_5_rc1part2.php
diff --git a/phpBB/includes/db/migration/data/30x/3_0_6.php b/phpBB/phpbb/db/migration/data/30x/3_0_6.php
index bb651dc7cd..bb651dc7cd 100644
--- a/phpBB/includes/db/migration/data/30x/3_0_6.php
+++ b/phpBB/phpbb/db/migration/data/30x/3_0_6.php
diff --git a/phpBB/includes/db/migration/data/30x/3_0_6_rc1.php b/phpBB/phpbb/db/migration/data/30x/3_0_6_rc1.php
index 38c282ebf0..38c282ebf0 100644
--- a/phpBB/includes/db/migration/data/30x/3_0_6_rc1.php
+++ b/phpBB/phpbb/db/migration/data/30x/3_0_6_rc1.php
diff --git a/phpBB/includes/db/migration/data/30x/3_0_6_rc2.php b/phpBB/phpbb/db/migration/data/30x/3_0_6_rc2.php
index a939dbd489..a939dbd489 100644
--- a/phpBB/includes/db/migration/data/30x/3_0_6_rc2.php
+++ b/phpBB/phpbb/db/migration/data/30x/3_0_6_rc2.php
diff --git a/phpBB/includes/db/migration/data/30x/3_0_6_rc3.php b/phpBB/phpbb/db/migration/data/30x/3_0_6_rc3.php
index b3f09d8ab8..b3f09d8ab8 100644
--- a/phpBB/includes/db/migration/data/30x/3_0_6_rc3.php
+++ b/phpBB/phpbb/db/migration/data/30x/3_0_6_rc3.php
diff --git a/phpBB/includes/db/migration/data/30x/3_0_6_rc4.php b/phpBB/phpbb/db/migration/data/30x/3_0_6_rc4.php
index fc2923f99b..fc2923f99b 100644
--- a/phpBB/includes/db/migration/data/30x/3_0_6_rc4.php
+++ b/phpBB/phpbb/db/migration/data/30x/3_0_6_rc4.php
diff --git a/phpBB/includes/db/migration/data/30x/3_0_7.php b/phpBB/phpbb/db/migration/data/30x/3_0_7.php
index 9ff2e9e4ab..9ff2e9e4ab 100644
--- a/phpBB/includes/db/migration/data/30x/3_0_7.php
+++ b/phpBB/phpbb/db/migration/data/30x/3_0_7.php
diff --git a/phpBB/includes/db/migration/data/30x/3_0_7_pl1.php b/phpBB/phpbb/db/migration/data/30x/3_0_7_pl1.php
index c9cc9d19ac..c9cc9d19ac 100644
--- a/phpBB/includes/db/migration/data/30x/3_0_7_pl1.php
+++ b/phpBB/phpbb/db/migration/data/30x/3_0_7_pl1.php
diff --git a/phpBB/includes/db/migration/data/30x/3_0_7_rc1.php b/phpBB/phpbb/db/migration/data/30x/3_0_7_rc1.php
index ffebf66f2d..ffebf66f2d 100644
--- a/phpBB/includes/db/migration/data/30x/3_0_7_rc1.php
+++ b/phpBB/phpbb/db/migration/data/30x/3_0_7_rc1.php
diff --git a/phpBB/includes/db/migration/data/30x/3_0_7_rc2.php b/phpBB/phpbb/db/migration/data/30x/3_0_7_rc2.php
index 55bc2bc679..55bc2bc679 100644
--- a/phpBB/includes/db/migration/data/30x/3_0_7_rc2.php
+++ b/phpBB/phpbb/db/migration/data/30x/3_0_7_rc2.php
diff --git a/phpBB/includes/db/migration/data/30x/3_0_8.php b/phpBB/phpbb/db/migration/data/30x/3_0_8.php
index 8998ef9627..8998ef9627 100644
--- a/phpBB/includes/db/migration/data/30x/3_0_8.php
+++ b/phpBB/phpbb/db/migration/data/30x/3_0_8.php
diff --git a/phpBB/includes/db/migration/data/30x/3_0_8_rc1.php b/phpBB/phpbb/db/migration/data/30x/3_0_8_rc1.php
index aeff35333e..aeff35333e 100644
--- a/phpBB/includes/db/migration/data/30x/3_0_8_rc1.php
+++ b/phpBB/phpbb/db/migration/data/30x/3_0_8_rc1.php
diff --git a/phpBB/includes/db/migration/data/30x/3_0_9.php b/phpBB/phpbb/db/migration/data/30x/3_0_9.php
index d5269ea6f0..d5269ea6f0 100644
--- a/phpBB/includes/db/migration/data/30x/3_0_9.php
+++ b/phpBB/phpbb/db/migration/data/30x/3_0_9.php
diff --git a/phpBB/includes/db/migration/data/30x/3_0_9_rc1.php b/phpBB/phpbb/db/migration/data/30x/3_0_9_rc1.php
index 4c345b429b..4c345b429b 100644
--- a/phpBB/includes/db/migration/data/30x/3_0_9_rc1.php
+++ b/phpBB/phpbb/db/migration/data/30x/3_0_9_rc1.php
diff --git a/phpBB/includes/db/migration/data/30x/3_0_9_rc2.php b/phpBB/phpbb/db/migration/data/30x/3_0_9_rc2.php
index c0e662aa45..c0e662aa45 100644
--- a/phpBB/includes/db/migration/data/30x/3_0_9_rc2.php
+++ b/phpBB/phpbb/db/migration/data/30x/3_0_9_rc2.php
diff --git a/phpBB/includes/db/migration/data/30x/3_0_9_rc3.php b/phpBB/phpbb/db/migration/data/30x/3_0_9_rc3.php
index d6d1f14b2e..d6d1f14b2e 100644
--- a/phpBB/includes/db/migration/data/30x/3_0_9_rc3.php
+++ b/phpBB/phpbb/db/migration/data/30x/3_0_9_rc3.php
diff --git a/phpBB/includes/db/migration/data/30x/3_0_9_rc4.php b/phpBB/phpbb/db/migration/data/30x/3_0_9_rc4.php
index e673249343..e673249343 100644
--- a/phpBB/includes/db/migration/data/30x/3_0_9_rc4.php
+++ b/phpBB/phpbb/db/migration/data/30x/3_0_9_rc4.php
diff --git a/phpBB/includes/db/migration/data/30x/local_url_bbcode.php b/phpBB/phpbb/db/migration/data/30x/local_url_bbcode.php
index f324b8880d..f324b8880d 100644
--- a/phpBB/includes/db/migration/data/30x/local_url_bbcode.php
+++ b/phpBB/phpbb/db/migration/data/30x/local_url_bbcode.php
diff --git a/phpBB/includes/db/migration/data/310/avatars.php b/phpBB/phpbb/db/migration/data/310/avatars.php
index 79547337f7..79547337f7 100644
--- a/phpBB/includes/db/migration/data/310/avatars.php
+++ b/phpBB/phpbb/db/migration/data/310/avatars.php
diff --git a/phpBB/includes/db/migration/data/310/boardindex.php b/phpBB/phpbb/db/migration/data/310/boardindex.php
index 965e32c15c..965e32c15c 100644
--- a/phpBB/includes/db/migration/data/310/boardindex.php
+++ b/phpBB/phpbb/db/migration/data/310/boardindex.php
diff --git a/phpBB/includes/db/migration/data/310/config_db_text.php b/phpBB/phpbb/db/migration/data/310/config_db_text.php
index 89f211adda..89f211adda 100644
--- a/phpBB/includes/db/migration/data/310/config_db_text.php
+++ b/phpBB/phpbb/db/migration/data/310/config_db_text.php
diff --git a/phpBB/includes/db/migration/data/310/dev.php b/phpBB/phpbb/db/migration/data/310/dev.php
index 0fc2950987..0fc2950987 100644
--- a/phpBB/includes/db/migration/data/310/dev.php
+++ b/phpBB/phpbb/db/migration/data/310/dev.php
diff --git a/phpBB/includes/db/migration/data/310/extensions.php b/phpBB/phpbb/db/migration/data/310/extensions.php
index 6a9caa1cfc..6a9caa1cfc 100644
--- a/phpBB/includes/db/migration/data/310/extensions.php
+++ b/phpBB/phpbb/db/migration/data/310/extensions.php
diff --git a/phpBB/includes/db/migration/data/310/forgot_password.php b/phpBB/phpbb/db/migration/data/310/forgot_password.php
index a553e51f35..a553e51f35 100644
--- a/phpBB/includes/db/migration/data/310/forgot_password.php
+++ b/phpBB/phpbb/db/migration/data/310/forgot_password.php
diff --git a/phpBB/includes/db/migration/data/310/jquery_update.php b/phpBB/phpbb/db/migration/data/310/jquery_update.php
index dc49f74fcb..dc49f74fcb 100644
--- a/phpBB/includes/db/migration/data/310/jquery_update.php
+++ b/phpBB/phpbb/db/migration/data/310/jquery_update.php
diff --git a/phpBB/includes/db/migration/data/310/notification_options_reconvert.php b/phpBB/phpbb/db/migration/data/310/notification_options_reconvert.php
index d994d7ec5f..d994d7ec5f 100644
--- a/phpBB/includes/db/migration/data/310/notification_options_reconvert.php
+++ b/phpBB/phpbb/db/migration/data/310/notification_options_reconvert.php
diff --git a/phpBB/includes/db/migration/data/310/notifications.php b/phpBB/phpbb/db/migration/data/310/notifications.php
index 17c939d95a..17c939d95a 100644
--- a/phpBB/includes/db/migration/data/310/notifications.php
+++ b/phpBB/phpbb/db/migration/data/310/notifications.php
diff --git a/phpBB/includes/db/migration/data/310/notifications_schema_fix.php b/phpBB/phpbb/db/migration/data/310/notifications_schema_fix.php
index 27e63e10d0..27e63e10d0 100644
--- a/phpBB/includes/db/migration/data/310/notifications_schema_fix.php
+++ b/phpBB/phpbb/db/migration/data/310/notifications_schema_fix.php
diff --git a/phpBB/includes/db/migration/data/310/reported_posts_display.php b/phpBB/phpbb/db/migration/data/310/reported_posts_display.php
index 80a0a0e43f..80a0a0e43f 100644
--- a/phpBB/includes/db/migration/data/310/reported_posts_display.php
+++ b/phpBB/phpbb/db/migration/data/310/reported_posts_display.php
diff --git a/phpBB/includes/db/migration/data/310/signature_module_auth.php b/phpBB/phpbb/db/migration/data/310/signature_module_auth.php
index e4fbb27bcb..e4fbb27bcb 100644
--- a/phpBB/includes/db/migration/data/310/signature_module_auth.php
+++ b/phpBB/phpbb/db/migration/data/310/signature_module_auth.php
diff --git a/phpBB/includes/db/migration/data/310/softdelete_p1.php b/phpBB/phpbb/db/migration/data/310/softdelete_p1.php
index 84f8eebd4a..84f8eebd4a 100644
--- a/phpBB/includes/db/migration/data/310/softdelete_p1.php
+++ b/phpBB/phpbb/db/migration/data/310/softdelete_p1.php
diff --git a/phpBB/includes/db/migration/data/310/softdelete_p2.php b/phpBB/phpbb/db/migration/data/310/softdelete_p2.php
index 7320a2c2bf..7320a2c2bf 100644
--- a/phpBB/includes/db/migration/data/310/softdelete_p2.php
+++ b/phpBB/phpbb/db/migration/data/310/softdelete_p2.php
diff --git a/phpBB/includes/db/migration/data/310/style_update_p1.php b/phpBB/phpbb/db/migration/data/310/style_update_p1.php
index d43537559d..d43537559d 100644
--- a/phpBB/includes/db/migration/data/310/style_update_p1.php
+++ b/phpBB/phpbb/db/migration/data/310/style_update_p1.php
diff --git a/phpBB/includes/db/migration/data/310/style_update_p2.php b/phpBB/phpbb/db/migration/data/310/style_update_p2.php
index 7b10518a66..7b10518a66 100644
--- a/phpBB/includes/db/migration/data/310/style_update_p2.php
+++ b/phpBB/phpbb/db/migration/data/310/style_update_p2.php
diff --git a/phpBB/includes/db/migration/data/310/teampage.php b/phpBB/phpbb/db/migration/data/310/teampage.php
index 4e77da17b7..4e77da17b7 100644
--- a/phpBB/includes/db/migration/data/310/teampage.php
+++ b/phpBB/phpbb/db/migration/data/310/teampage.php
diff --git a/phpBB/includes/db/migration/data/310/timezone.php b/phpBB/phpbb/db/migration/data/310/timezone.php
index 6e50cbe45f..6e50cbe45f 100644
--- a/phpBB/includes/db/migration/data/310/timezone.php
+++ b/phpBB/phpbb/db/migration/data/310/timezone.php
diff --git a/phpBB/includes/db/migration/data/310/timezone_p2.php b/phpBB/phpbb/db/migration/data/310/timezone_p2.php
index 113b979e4f..113b979e4f 100644
--- a/phpBB/includes/db/migration/data/310/timezone_p2.php
+++ b/phpBB/phpbb/db/migration/data/310/timezone_p2.php
diff --git a/phpBB/includes/db/migration/exception.php b/phpBB/phpbb/db/migration/exception.php
index e84330dd71..e84330dd71 100644
--- a/phpBB/includes/db/migration/exception.php
+++ b/phpBB/phpbb/db/migration/exception.php
diff --git a/phpBB/includes/db/migration/migration.php b/phpBB/phpbb/db/migration/migration.php
index 0ffa96fd14..0ffa96fd14 100644
--- a/phpBB/includes/db/migration/migration.php
+++ b/phpBB/phpbb/db/migration/migration.php
diff --git a/phpBB/includes/db/migration/tool/config.php b/phpBB/phpbb/db/migration/tool/config.php
index 0b626bf455..0b626bf455 100644
--- a/phpBB/includes/db/migration/tool/config.php
+++ b/phpBB/phpbb/db/migration/tool/config.php
diff --git a/phpBB/includes/db/migration/tool/interface.php b/phpBB/phpbb/db/migration/tool/interface.php
index ced53b2023..ced53b2023 100644
--- a/phpBB/includes/db/migration/tool/interface.php
+++ b/phpBB/phpbb/db/migration/tool/interface.php
diff --git a/phpBB/includes/db/migration/tool/module.php b/phpBB/phpbb/db/migration/tool/module.php
index ac4d2c9bd7..ac4d2c9bd7 100644
--- a/phpBB/includes/db/migration/tool/module.php
+++ b/phpBB/phpbb/db/migration/tool/module.php
diff --git a/phpBB/includes/db/migration/tool/permission.php b/phpBB/phpbb/db/migration/tool/permission.php
index 2f09c0ac72..2f09c0ac72 100644
--- a/phpBB/includes/db/migration/tool/permission.php
+++ b/phpBB/phpbb/db/migration/tool/permission.php
diff --git a/phpBB/includes/db/migrator.php b/phpBB/phpbb/db/migrator.php
index ca3ffc8043..ca3ffc8043 100644
--- a/phpBB/includes/db/migrator.php
+++ b/phpBB/phpbb/db/migrator.php
diff --git a/phpBB/includes/db/sql_insert_buffer.php b/phpBB/phpbb/db/sql_insert_buffer.php
index c18f908429..c18f908429 100644
--- a/phpBB/includes/db/sql_insert_buffer.php
+++ b/phpBB/phpbb/db/sql_insert_buffer.php
diff --git a/phpBB/includes/di/extension/config.php b/phpBB/phpbb/di/extension/config.php
index 6c272a6588..6c272a6588 100644
--- a/phpBB/includes/di/extension/config.php
+++ b/phpBB/phpbb/di/extension/config.php
diff --git a/phpBB/includes/di/extension/core.php b/phpBB/phpbb/di/extension/core.php
index 9c36ba2fc4..9c36ba2fc4 100644
--- a/phpBB/includes/di/extension/core.php
+++ b/phpBB/phpbb/di/extension/core.php
diff --git a/phpBB/includes/di/extension/ext.php b/phpBB/phpbb/di/extension/ext.php
index 7d9b433751..7d9b433751 100644
--- a/phpBB/includes/di/extension/ext.php
+++ b/phpBB/phpbb/di/extension/ext.php
diff --git a/phpBB/includes/di/pass/collection_pass.php b/phpBB/phpbb/di/pass/collection_pass.php
index 63a5c7dfc4..63a5c7dfc4 100644
--- a/phpBB/includes/di/pass/collection_pass.php
+++ b/phpBB/phpbb/di/pass/collection_pass.php
diff --git a/phpBB/includes/di/pass/kernel_pass.php b/phpBB/phpbb/di/pass/kernel_pass.php
index a701ebcfa6..a701ebcfa6 100644
--- a/phpBB/includes/di/pass/kernel_pass.php
+++ b/phpBB/phpbb/di/pass/kernel_pass.php
diff --git a/phpBB/includes/di/service_collection.php b/phpBB/phpbb/di/service_collection.php
index 880cb46d4d..880cb46d4d 100644
--- a/phpBB/includes/di/service_collection.php
+++ b/phpBB/phpbb/di/service_collection.php
diff --git a/phpBB/includes/error_collector.php b/phpBB/phpbb/error_collector.php
index 358da747b8..358da747b8 100644
--- a/phpBB/includes/error_collector.php
+++ b/phpBB/phpbb/error_collector.php
diff --git a/phpBB/includes/event/data.php b/phpBB/phpbb/event/data.php
index 70718ff0ae..70718ff0ae 100644
--- a/phpBB/includes/event/data.php
+++ b/phpBB/phpbb/event/data.php
diff --git a/phpBB/includes/event/dispatcher.php b/phpBB/phpbb/event/dispatcher.php
index 4f637ce3bb..4f637ce3bb 100644
--- a/phpBB/includes/event/dispatcher.php
+++ b/phpBB/phpbb/event/dispatcher.php
diff --git a/phpBB/includes/event/extension_subscriber_loader.php b/phpBB/phpbb/event/extension_subscriber_loader.php
index d933b943d7..d933b943d7 100644
--- a/phpBB/includes/event/extension_subscriber_loader.php
+++ b/phpBB/phpbb/event/extension_subscriber_loader.php
diff --git a/phpBB/includes/event/kernel_exception_subscriber.php b/phpBB/phpbb/event/kernel_exception_subscriber.php
index f90989a74c..f90989a74c 100644
--- a/phpBB/includes/event/kernel_exception_subscriber.php
+++ b/phpBB/phpbb/event/kernel_exception_subscriber.php
diff --git a/phpBB/includes/event/kernel_request_subscriber.php b/phpBB/phpbb/event/kernel_request_subscriber.php
index afb8464f80..afb8464f80 100644
--- a/phpBB/includes/event/kernel_request_subscriber.php
+++ b/phpBB/phpbb/event/kernel_request_subscriber.php
diff --git a/phpBB/includes/event/kernel_terminate_subscriber.php b/phpBB/phpbb/event/kernel_terminate_subscriber.php
index 1eaf890e42..1eaf890e42 100644
--- a/phpBB/includes/event/kernel_terminate_subscriber.php
+++ b/phpBB/phpbb/event/kernel_terminate_subscriber.php
diff --git a/phpBB/includes/extension/base.php b/phpBB/phpbb/extension/base.php
index c4462b64d8..c4462b64d8 100644
--- a/phpBB/includes/extension/base.php
+++ b/phpBB/phpbb/extension/base.php
diff --git a/phpBB/includes/extension/exception.php b/phpBB/phpbb/extension/exception.php
index e08a8912ea..e08a8912ea 100644
--- a/phpBB/includes/extension/exception.php
+++ b/phpBB/phpbb/extension/exception.php
diff --git a/phpBB/includes/extension/finder.php b/phpBB/phpbb/extension/finder.php
index 49bb2a514f..155a41cda5 100644
--- a/phpBB/includes/extension/finder.php
+++ b/phpBB/phpbb/extension/finder.php
@@ -275,7 +275,7 @@ class phpbb_extension_finder
 		$classes = array();
 		foreach ($files as $file => $ext_name)
 		{
-			$file = preg_replace('#^includes/#', '', $file);
+			$file = preg_replace('#^(phpbb|includes)/#', '', $file);
 
 			$classes[] = 'phpbb_' . str_replace('/', '_', substr($file, 0, -strlen('.' . $this->php_ext)));
 		}
@@ -377,7 +377,7 @@ class phpbb_extension_finder
 
 		return $files;
 	}
-	
+
 	/**
 	* Finds all file system entries matching the configured options for one
 	* specific extension
diff --git a/phpBB/includes/extension/interface.php b/phpBB/phpbb/extension/interface.php
index 7b36a12bf6..7b36a12bf6 100644
--- a/phpBB/includes/extension/interface.php
+++ b/phpBB/phpbb/extension/interface.php
diff --git a/phpBB/includes/extension/manager.php b/phpBB/phpbb/extension/manager.php
index 4451049d04..4451049d04 100644
--- a/phpBB/includes/extension/manager.php
+++ b/phpBB/phpbb/extension/manager.php
diff --git a/phpBB/includes/extension/metadata_manager.php b/phpBB/phpbb/extension/metadata_manager.php
index 14b77c085b..14b77c085b 100644
--- a/phpBB/includes/extension/metadata_manager.php
+++ b/phpBB/phpbb/extension/metadata_manager.php
diff --git a/phpBB/includes/extension/provider.php b/phpBB/phpbb/extension/provider.php
index 45b55e5cab..45b55e5cab 100644
--- a/phpBB/includes/extension/provider.php
+++ b/phpBB/phpbb/extension/provider.php
diff --git a/phpBB/includes/feed/base.php b/phpBB/phpbb/feed/base.php
index 296d830932..296d830932 100644
--- a/phpBB/includes/feed/base.php
+++ b/phpBB/phpbb/feed/base.php
diff --git a/phpBB/includes/feed/factory.php b/phpBB/phpbb/feed/factory.php
index 63a1eb8ef0..63a1eb8ef0 100644
--- a/phpBB/includes/feed/factory.php
+++ b/phpBB/phpbb/feed/factory.php
diff --git a/phpBB/includes/feed/forum.php b/phpBB/phpbb/feed/forum.php
index b5f0dd0f8f..b5f0dd0f8f 100644
--- a/phpBB/includes/feed/forum.php
+++ b/phpBB/phpbb/feed/forum.php
diff --git a/phpBB/includes/feed/forums.php b/phpBB/phpbb/feed/forums.php
index 409097a9f3..409097a9f3 100644
--- a/phpBB/includes/feed/forums.php
+++ b/phpBB/phpbb/feed/forums.php
diff --git a/phpBB/includes/feed/helper.php b/phpBB/phpbb/feed/helper.php
index 93330aa2ad..93330aa2ad 100644
--- a/phpBB/includes/feed/helper.php
+++ b/phpBB/phpbb/feed/helper.php
diff --git a/phpBB/includes/feed/news.php b/phpBB/phpbb/feed/news.php
index f2d45b5165..f2d45b5165 100644
--- a/phpBB/includes/feed/news.php
+++ b/phpBB/phpbb/feed/news.php
diff --git a/phpBB/includes/feed/overall.php b/phpBB/phpbb/feed/overall.php
index 869df7cde0..869df7cde0 100644
--- a/phpBB/includes/feed/overall.php
+++ b/phpBB/phpbb/feed/overall.php
diff --git a/phpBB/includes/feed/post_base.php b/phpBB/phpbb/feed/post_base.php
index 1f4cb4b5ef..1f4cb4b5ef 100644
--- a/phpBB/includes/feed/post_base.php
+++ b/phpBB/phpbb/feed/post_base.php
diff --git a/phpBB/includes/feed/topic.php b/phpBB/phpbb/feed/topic.php
index 36f958ac60..36f958ac60 100644
--- a/phpBB/includes/feed/topic.php
+++ b/phpBB/phpbb/feed/topic.php
diff --git a/phpBB/includes/feed/topic_base.php b/phpBB/phpbb/feed/topic_base.php
index b104a46631..b104a46631 100644
--- a/phpBB/includes/feed/topic_base.php
+++ b/phpBB/phpbb/feed/topic_base.php
diff --git a/phpBB/includes/feed/topics.php b/phpBB/phpbb/feed/topics.php
index 31f5177773..31f5177773 100644
--- a/phpBB/includes/feed/topics.php
+++ b/phpBB/phpbb/feed/topics.php
diff --git a/phpBB/includes/feed/topics_active.php b/phpBB/phpbb/feed/topics_active.php
index 249dd1d66a..249dd1d66a 100644
--- a/phpBB/includes/feed/topics_active.php
+++ b/phpBB/phpbb/feed/topics_active.php
diff --git a/phpBB/includes/filesystem.php b/phpBB/phpbb/filesystem.php
index 27cab48fb0..27cab48fb0 100644
--- a/phpBB/includes/filesystem.php
+++ b/phpBB/phpbb/filesystem.php
diff --git a/phpBB/includes/groupposition/exception.php b/phpBB/phpbb/groupposition/exception.php
index e4ff09c703..e4ff09c703 100644
--- a/phpBB/includes/groupposition/exception.php
+++ b/phpBB/phpbb/groupposition/exception.php
diff --git a/phpBB/includes/groupposition/interface.php b/phpBB/phpbb/groupposition/interface.php
index eacc04e1a4..eacc04e1a4 100644
--- a/phpBB/includes/groupposition/interface.php
+++ b/phpBB/phpbb/groupposition/interface.php
diff --git a/phpBB/includes/groupposition/legend.php b/phpBB/phpbb/groupposition/legend.php
index 7fddadde99..7fddadde99 100644
--- a/phpBB/includes/groupposition/legend.php
+++ b/phpBB/phpbb/groupposition/legend.php
diff --git a/phpBB/includes/groupposition/teampage.php b/phpBB/phpbb/groupposition/teampage.php
index 7c758199e7..7c758199e7 100644
--- a/phpBB/includes/groupposition/teampage.php
+++ b/phpBB/phpbb/groupposition/teampage.php
diff --git a/phpBB/includes/hook/finder.php b/phpBB/phpbb/hook/finder.php
index 7b0412f733..7b0412f733 100644
--- a/phpBB/includes/hook/finder.php
+++ b/phpBB/phpbb/hook/finder.php
diff --git a/phpBB/includes/json_response.php b/phpBB/phpbb/json_response.php
index 5dd904da09..5dd904da09 100644
--- a/phpBB/includes/json_response.php
+++ b/phpBB/phpbb/json_response.php
diff --git a/phpBB/includes/lock/db.php b/phpBB/phpbb/lock/db.php
index 5cc0821aa0..5cc0821aa0 100644
--- a/phpBB/includes/lock/db.php
+++ b/phpBB/phpbb/lock/db.php
diff --git a/phpBB/includes/lock/flock.php b/phpBB/phpbb/lock/flock.php
index 17de0847c0..17de0847c0 100644
--- a/phpBB/includes/lock/flock.php
+++ b/phpBB/phpbb/lock/flock.php
diff --git a/phpBB/includes/log/interface.php b/phpBB/phpbb/log/interface.php
index 3b459c9bdf..3b459c9bdf 100644
--- a/phpBB/includes/log/interface.php
+++ b/phpBB/phpbb/log/interface.php
diff --git a/phpBB/includes/log/log.php b/phpBB/phpbb/log/log.php
index 7a26858348..7a26858348 100644
--- a/phpBB/includes/log/log.php
+++ b/phpBB/phpbb/log/log.php
diff --git a/phpBB/includes/notification/exception.php b/phpBB/phpbb/notification/exception.php
index a52d6fdc57..a52d6fdc57 100644
--- a/phpBB/includes/notification/exception.php
+++ b/phpBB/phpbb/notification/exception.php
diff --git a/phpBB/includes/notification/manager.php b/phpBB/phpbb/notification/manager.php
index 97833710c0..97833710c0 100644
--- a/phpBB/includes/notification/manager.php
+++ b/phpBB/phpbb/notification/manager.php
diff --git a/phpBB/includes/notification/method/base.php b/phpBB/phpbb/notification/method/base.php
index b633956d01..b633956d01 100644
--- a/phpBB/includes/notification/method/base.php
+++ b/phpBB/phpbb/notification/method/base.php
diff --git a/phpBB/includes/notification/method/email.php b/phpBB/phpbb/notification/method/email.php
index 571b0ec656..571b0ec656 100644
--- a/phpBB/includes/notification/method/email.php
+++ b/phpBB/phpbb/notification/method/email.php
diff --git a/phpBB/includes/notification/method/interface.php b/phpBB/phpbb/notification/method/interface.php
index ef875942cc..ef875942cc 100644
--- a/phpBB/includes/notification/method/interface.php
+++ b/phpBB/phpbb/notification/method/interface.php
diff --git a/phpBB/includes/notification/method/jabber.php b/phpBB/phpbb/notification/method/jabber.php
index d3b756d020..d3b756d020 100644
--- a/phpBB/includes/notification/method/jabber.php
+++ b/phpBB/phpbb/notification/method/jabber.php
diff --git a/phpBB/includes/notification/method/messenger_base.php b/phpBB/phpbb/notification/method/messenger_base.php
index 4966aa94bc..4966aa94bc 100644
--- a/phpBB/includes/notification/method/messenger_base.php
+++ b/phpBB/phpbb/notification/method/messenger_base.php
diff --git a/phpBB/includes/notification/type/approve_post.php b/phpBB/phpbb/notification/type/approve_post.php
index 1a30781c35..1a30781c35 100644
--- a/phpBB/includes/notification/type/approve_post.php
+++ b/phpBB/phpbb/notification/type/approve_post.php
diff --git a/phpBB/includes/notification/type/approve_topic.php b/phpBB/phpbb/notification/type/approve_topic.php
index e728e9ac30..e728e9ac30 100644
--- a/phpBB/includes/notification/type/approve_topic.php
+++ b/phpBB/phpbb/notification/type/approve_topic.php
diff --git a/phpBB/includes/notification/type/base.php b/phpBB/phpbb/notification/type/base.php
index 46517f1c9b..46517f1c9b 100644
--- a/phpBB/includes/notification/type/base.php
+++ b/phpBB/phpbb/notification/type/base.php
diff --git a/phpBB/includes/notification/type/bookmark.php b/phpBB/phpbb/notification/type/bookmark.php
index ae2e75d3eb..ae2e75d3eb 100644
--- a/phpBB/includes/notification/type/bookmark.php
+++ b/phpBB/phpbb/notification/type/bookmark.php
diff --git a/phpBB/includes/notification/type/disapprove_post.php b/phpBB/phpbb/notification/type/disapprove_post.php
index 951c7e0254..951c7e0254 100644
--- a/phpBB/includes/notification/type/disapprove_post.php
+++ b/phpBB/phpbb/notification/type/disapprove_post.php
diff --git a/phpBB/includes/notification/type/disapprove_topic.php b/phpBB/phpbb/notification/type/disapprove_topic.php
index 038e528797..038e528797 100644
--- a/phpBB/includes/notification/type/disapprove_topic.php
+++ b/phpBB/phpbb/notification/type/disapprove_topic.php
diff --git a/phpBB/includes/notification/type/interface.php b/phpBB/phpbb/notification/type/interface.php
index a40fdafd09..a40fdafd09 100644
--- a/phpBB/includes/notification/type/interface.php
+++ b/phpBB/phpbb/notification/type/interface.php
diff --git a/phpBB/includes/notification/type/pm.php b/phpBB/phpbb/notification/type/pm.php
index b3db7ad5ad..b3db7ad5ad 100644
--- a/phpBB/includes/notification/type/pm.php
+++ b/phpBB/phpbb/notification/type/pm.php
diff --git a/phpBB/includes/notification/type/post.php b/phpBB/phpbb/notification/type/post.php
index 9207fd866e..9207fd866e 100644
--- a/phpBB/includes/notification/type/post.php
+++ b/phpBB/phpbb/notification/type/post.php
diff --git a/phpBB/includes/notification/type/post_in_queue.php b/phpBB/phpbb/notification/type/post_in_queue.php
index bc4b15cdc3..bc4b15cdc3 100644
--- a/phpBB/includes/notification/type/post_in_queue.php
+++ b/phpBB/phpbb/notification/type/post_in_queue.php
diff --git a/phpBB/includes/notification/type/quote.php b/phpBB/phpbb/notification/type/quote.php
index 0ed13f36fb..0ed13f36fb 100644
--- a/phpBB/includes/notification/type/quote.php
+++ b/phpBB/phpbb/notification/type/quote.php
diff --git a/phpBB/includes/notification/type/report_pm.php b/phpBB/phpbb/notification/type/report_pm.php
index 3fa73bab41..3fa73bab41 100644
--- a/phpBB/includes/notification/type/report_pm.php
+++ b/phpBB/phpbb/notification/type/report_pm.php
diff --git a/phpBB/includes/notification/type/report_pm_closed.php b/phpBB/phpbb/notification/type/report_pm_closed.php
index 63dfa92064..63dfa92064 100644
--- a/phpBB/includes/notification/type/report_pm_closed.php
+++ b/phpBB/phpbb/notification/type/report_pm_closed.php
diff --git a/phpBB/includes/notification/type/report_post.php b/phpBB/phpbb/notification/type/report_post.php
index de5c54a291..de5c54a291 100644
--- a/phpBB/includes/notification/type/report_post.php
+++ b/phpBB/phpbb/notification/type/report_post.php
diff --git a/phpBB/includes/notification/type/report_post_closed.php b/phpBB/phpbb/notification/type/report_post_closed.php
index 3916cd8db7..3916cd8db7 100644
--- a/phpBB/includes/notification/type/report_post_closed.php
+++ b/phpBB/phpbb/notification/type/report_post_closed.php
diff --git a/phpBB/includes/notification/type/topic.php b/phpBB/phpbb/notification/type/topic.php
index 22436d3fb1..22436d3fb1 100644
--- a/phpBB/includes/notification/type/topic.php
+++ b/phpBB/phpbb/notification/type/topic.php
diff --git a/phpBB/includes/notification/type/topic_in_queue.php b/phpBB/phpbb/notification/type/topic_in_queue.php
index f735e10c00..f735e10c00 100644
--- a/phpBB/includes/notification/type/topic_in_queue.php
+++ b/phpBB/phpbb/notification/type/topic_in_queue.php
diff --git a/phpBB/includes/php/ini.php b/phpBB/phpbb/php/ini.php
index 17e8c54a57..17e8c54a57 100644
--- a/phpBB/includes/php/ini.php
+++ b/phpBB/phpbb/php/ini.php
diff --git a/phpBB/includes/request/deactivated_super_global.php b/phpBB/phpbb/request/deactivated_super_global.php
index cc05847ec7..cc05847ec7 100644
--- a/phpBB/includes/request/deactivated_super_global.php
+++ b/phpBB/phpbb/request/deactivated_super_global.php
diff --git a/phpBB/includes/request/interface.php b/phpBB/phpbb/request/interface.php
index 741db35917..741db35917 100644
--- a/phpBB/includes/request/interface.php
+++ b/phpBB/phpbb/request/interface.php
diff --git a/phpBB/includes/request/request.php b/phpBB/phpbb/request/request.php
index ae3c526d89..ae3c526d89 100644
--- a/phpBB/includes/request/request.php
+++ b/phpBB/phpbb/request/request.php
diff --git a/phpBB/includes/request/type_cast_helper.php b/phpBB/phpbb/request/type_cast_helper.php
index 1a5274ed14..1a5274ed14 100644
--- a/phpBB/includes/request/type_cast_helper.php
+++ b/phpBB/phpbb/request/type_cast_helper.php
diff --git a/phpBB/includes/request/type_cast_helper_interface.php b/phpBB/phpbb/request/type_cast_helper_interface.php
index 3920d16fc7..3920d16fc7 100644
--- a/phpBB/includes/request/type_cast_helper_interface.php
+++ b/phpBB/phpbb/request/type_cast_helper_interface.php
diff --git a/phpBB/includes/search/base.php b/phpBB/phpbb/search/base.php
index 914cef9167..914cef9167 100644
--- a/phpBB/includes/search/base.php
+++ b/phpBB/phpbb/search/base.php
diff --git a/phpBB/includes/search/fulltext_mysql.php b/phpBB/phpbb/search/fulltext_mysql.php
index 7dc4da8ffe..7dc4da8ffe 100644
--- a/phpBB/includes/search/fulltext_mysql.php
+++ b/phpBB/phpbb/search/fulltext_mysql.php
diff --git a/phpBB/includes/search/fulltext_native.php b/phpBB/phpbb/search/fulltext_native.php
index 730c3a6c2d..730c3a6c2d 100644
--- a/phpBB/includes/search/fulltext_native.php
+++ b/phpBB/phpbb/search/fulltext_native.php
diff --git a/phpBB/includes/search/fulltext_postgres.php b/phpBB/phpbb/search/fulltext_postgres.php
index 6b4b310f2e..6b4b310f2e 100644
--- a/phpBB/includes/search/fulltext_postgres.php
+++ b/phpBB/phpbb/search/fulltext_postgres.php
diff --git a/phpBB/includes/search/fulltext_sphinx.php b/phpBB/phpbb/search/fulltext_sphinx.php
index 2f7b236c78..2f7b236c78 100644
--- a/phpBB/includes/search/fulltext_sphinx.php
+++ b/phpBB/phpbb/search/fulltext_sphinx.php
diff --git a/phpBB/includes/search/index.htm b/phpBB/phpbb/search/index.htm
index ee1f723a7d..ee1f723a7d 100644
--- a/phpBB/includes/search/index.htm
+++ b/phpBB/phpbb/search/index.htm
diff --git a/phpBB/includes/search/sphinx/config.php b/phpBB/phpbb/search/sphinx/config.php
index f1864f0c8c..f1864f0c8c 100644
--- a/phpBB/includes/search/sphinx/config.php
+++ b/phpBB/phpbb/search/sphinx/config.php
diff --git a/phpBB/includes/search/sphinx/config_comment.php b/phpBB/phpbb/search/sphinx/config_comment.php
index 7f695dbf0c..7f695dbf0c 100644
--- a/phpBB/includes/search/sphinx/config_comment.php
+++ b/phpBB/phpbb/search/sphinx/config_comment.php
diff --git a/phpBB/includes/search/sphinx/config_section.php b/phpBB/phpbb/search/sphinx/config_section.php
index 79c9c8563d..79c9c8563d 100644
--- a/phpBB/includes/search/sphinx/config_section.php
+++ b/phpBB/phpbb/search/sphinx/config_section.php
diff --git a/phpBB/includes/search/sphinx/config_variable.php b/phpBB/phpbb/search/sphinx/config_variable.php
index 2c1d35a49c..2c1d35a49c 100644
--- a/phpBB/includes/search/sphinx/config_variable.php
+++ b/phpBB/phpbb/search/sphinx/config_variable.php
diff --git a/phpBB/includes/session.php b/phpBB/phpbb/session.php
index e0585b1523..e0585b1523 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/phpbb/session.php
diff --git a/phpBB/includes/style/extension_path_provider.php b/phpBB/phpbb/style/extension_path_provider.php
index ec1d85f821..ec1d85f821 100644
--- a/phpBB/includes/style/extension_path_provider.php
+++ b/phpBB/phpbb/style/extension_path_provider.php
diff --git a/phpBB/includes/style/path_provider.php b/phpBB/phpbb/style/path_provider.php
index 731d682e88..731d682e88 100644
--- a/phpBB/includes/style/path_provider.php
+++ b/phpBB/phpbb/style/path_provider.php
diff --git a/phpBB/includes/style/path_provider_interface.php b/phpBB/phpbb/style/path_provider_interface.php
index 1a6153a4d3..1a6153a4d3 100644
--- a/phpBB/includes/style/path_provider_interface.php
+++ b/phpBB/phpbb/style/path_provider_interface.php
diff --git a/phpBB/includes/style/resource_locator.php b/phpBB/phpbb/style/resource_locator.php
index 4cf767c062..4cf767c062 100644
--- a/phpBB/includes/style/resource_locator.php
+++ b/phpBB/phpbb/style/resource_locator.php
diff --git a/phpBB/includes/style/style.php b/phpBB/phpbb/style/style.php
index 034f518091..034f518091 100644
--- a/phpBB/includes/style/style.php
+++ b/phpBB/phpbb/style/style.php
diff --git a/phpBB/includes/template/asset.php b/phpBB/phpbb/template/asset.php
index 7c322cd971..7c322cd971 100644
--- a/phpBB/includes/template/asset.php
+++ b/phpBB/phpbb/template/asset.php
diff --git a/phpBB/includes/template/context.php b/phpBB/phpbb/template/context.php
index c5ce7422b9..c5ce7422b9 100644
--- a/phpBB/includes/template/context.php
+++ b/phpBB/phpbb/template/context.php
diff --git a/phpBB/includes/template/locator.php b/phpBB/phpbb/template/locator.php
index f6fd20bcc2..f6fd20bcc2 100644
--- a/phpBB/includes/template/locator.php
+++ b/phpBB/phpbb/template/locator.php
diff --git a/phpBB/includes/template/template.php b/phpBB/phpbb/template/template.php
index 89a01e924d..89a01e924d 100644
--- a/phpBB/includes/template/template.php
+++ b/phpBB/phpbb/template/template.php
diff --git a/phpBB/includes/template/twig/definition.php b/phpBB/phpbb/template/twig/definition.php
index 6557b209eb..6557b209eb 100644
--- a/phpBB/includes/template/twig/definition.php
+++ b/phpBB/phpbb/template/twig/definition.php
diff --git a/phpBB/includes/template/twig/environment.php b/phpBB/phpbb/template/twig/environment.php
index b60cd72325..b60cd72325 100644
--- a/phpBB/includes/template/twig/environment.php
+++ b/phpBB/phpbb/template/twig/environment.php
diff --git a/phpBB/includes/template/twig/extension.php b/phpBB/phpbb/template/twig/extension.php
index c279726434..c279726434 100644
--- a/phpBB/includes/template/twig/extension.php
+++ b/phpBB/phpbb/template/twig/extension.php
diff --git a/phpBB/includes/template/twig/lexer.php b/phpBB/phpbb/template/twig/lexer.php
index 46412ad048..46412ad048 100644
--- a/phpBB/includes/template/twig/lexer.php
+++ b/phpBB/phpbb/template/twig/lexer.php
diff --git a/phpBB/includes/template/twig/node/define.php b/phpBB/phpbb/template/twig/node/define.php
index fcb19cc773..fcb19cc773 100644
--- a/phpBB/includes/template/twig/node/define.php
+++ b/phpBB/phpbb/template/twig/node/define.php
diff --git a/phpBB/includes/template/twig/node/event.php b/phpBB/phpbb/template/twig/node/event.php
index 971dea14fa..971dea14fa 100644
--- a/phpBB/includes/template/twig/node/event.php
+++ b/phpBB/phpbb/template/twig/node/event.php
diff --git a/phpBB/includes/template/twig/node/expression/binary/equalequal.php b/phpBB/phpbb/template/twig/node/expression/binary/equalequal.php
index 8ec2069114..8ec2069114 100644
--- a/phpBB/includes/template/twig/node/expression/binary/equalequal.php
+++ b/phpBB/phpbb/template/twig/node/expression/binary/equalequal.php
diff --git a/phpBB/includes/template/twig/node/expression/binary/notequalequal.php b/phpBB/phpbb/template/twig/node/expression/binary/notequalequal.php
index 96f32c502e..96f32c502e 100644
--- a/phpBB/includes/template/twig/node/expression/binary/notequalequal.php
+++ b/phpBB/phpbb/template/twig/node/expression/binary/notequalequal.php
diff --git a/phpBB/includes/template/twig/node/include.php b/phpBB/phpbb/template/twig/node/include.php
index 5c6ae1bbcf..5c6ae1bbcf 100644
--- a/phpBB/includes/template/twig/node/include.php
+++ b/phpBB/phpbb/template/twig/node/include.php
diff --git a/phpBB/includes/template/twig/node/includeasset.php b/phpBB/phpbb/template/twig/node/includeasset.php
index 990b1c984f..990b1c984f 100644
--- a/phpBB/includes/template/twig/node/includeasset.php
+++ b/phpBB/phpbb/template/twig/node/includeasset.php
diff --git a/phpBB/includes/template/twig/node/includecss.php b/phpBB/phpbb/template/twig/node/includecss.php
index 01fda44aad..01fda44aad 100644
--- a/phpBB/includes/template/twig/node/includecss.php
+++ b/phpBB/phpbb/template/twig/node/includecss.php
diff --git a/phpBB/includes/template/twig/node/includejs.php b/phpBB/phpbb/template/twig/node/includejs.php
index fdf2bea3ed..fdf2bea3ed 100644
--- a/phpBB/includes/template/twig/node/includejs.php
+++ b/phpBB/phpbb/template/twig/node/includejs.php
diff --git a/phpBB/includes/template/twig/node/includephp.php b/phpBB/phpbb/template/twig/node/includephp.php
index dbe54f0e1a..dbe54f0e1a 100644
--- a/phpBB/includes/template/twig/node/includephp.php
+++ b/phpBB/phpbb/template/twig/node/includephp.php
diff --git a/phpBB/includes/template/twig/node/php.php b/phpBB/phpbb/template/twig/node/php.php
index c11539ea7f..c11539ea7f 100644
--- a/phpBB/includes/template/twig/node/php.php
+++ b/phpBB/phpbb/template/twig/node/php.php
diff --git a/phpBB/includes/template/twig/tokenparser/define.php b/phpBB/phpbb/template/twig/tokenparser/define.php
index 4ea15388c4..4ea15388c4 100644
--- a/phpBB/includes/template/twig/tokenparser/define.php
+++ b/phpBB/phpbb/template/twig/tokenparser/define.php
diff --git a/phpBB/includes/template/twig/tokenparser/event.php b/phpBB/phpbb/template/twig/tokenparser/event.php
index e4dddd6dcc..e4dddd6dcc 100644
--- a/phpBB/includes/template/twig/tokenparser/event.php
+++ b/phpBB/phpbb/template/twig/tokenparser/event.php
diff --git a/phpBB/includes/template/twig/tokenparser/include.php b/phpBB/phpbb/template/twig/tokenparser/include.php
index 520f9fd1a0..520f9fd1a0 100644
--- a/phpBB/includes/template/twig/tokenparser/include.php
+++ b/phpBB/phpbb/template/twig/tokenparser/include.php
diff --git a/phpBB/includes/template/twig/tokenparser/includecss.php b/phpBB/phpbb/template/twig/tokenparser/includecss.php
index 6c24dda647..6c24dda647 100644
--- a/phpBB/includes/template/twig/tokenparser/includecss.php
+++ b/phpBB/phpbb/template/twig/tokenparser/includecss.php
diff --git a/phpBB/includes/template/twig/tokenparser/includejs.php b/phpBB/phpbb/template/twig/tokenparser/includejs.php
index b02b2f89ba..b02b2f89ba 100644
--- a/phpBB/includes/template/twig/tokenparser/includejs.php
+++ b/phpBB/phpbb/template/twig/tokenparser/includejs.php
diff --git a/phpBB/includes/template/twig/tokenparser/includephp.php b/phpBB/phpbb/template/twig/tokenparser/includephp.php
index 13fe6de8a6..13fe6de8a6 100644
--- a/phpBB/includes/template/twig/tokenparser/includephp.php
+++ b/phpBB/phpbb/template/twig/tokenparser/includephp.php
diff --git a/phpBB/includes/template/twig/tokenparser/php.php b/phpBB/phpbb/template/twig/tokenparser/php.php
index 197980a59a..197980a59a 100644
--- a/phpBB/includes/template/twig/tokenparser/php.php
+++ b/phpBB/phpbb/template/twig/tokenparser/php.php
diff --git a/phpBB/includes/template/twig/twig.php b/phpBB/phpbb/template/twig/twig.php
index 92a37d1634..92a37d1634 100644
--- a/phpBB/includes/template/twig/twig.php
+++ b/phpBB/phpbb/template/twig/twig.php
diff --git a/phpBB/includes/tree/interface.php b/phpBB/phpbb/tree/interface.php
index cc8aab2115..cc8aab2115 100644
--- a/phpBB/includes/tree/interface.php
+++ b/phpBB/phpbb/tree/interface.php
diff --git a/phpBB/includes/tree/nestedset.php b/phpBB/phpbb/tree/nestedset.php
index 4d851a87a8..4d851a87a8 100644
--- a/phpBB/includes/tree/nestedset.php
+++ b/phpBB/phpbb/tree/nestedset.php
diff --git a/phpBB/includes/tree/nestedset_forum.php b/phpBB/phpbb/tree/nestedset_forum.php
index ff09ef55d0..ff09ef55d0 100644
--- a/phpBB/includes/tree/nestedset_forum.php
+++ b/phpBB/phpbb/tree/nestedset_forum.php
diff --git a/phpBB/includes/user.php b/phpBB/phpbb/user.php
index 5530fe3f03..5530fe3f03 100644
--- a/phpBB/includes/user.php
+++ b/phpBB/phpbb/user.php
diff --git a/phpBB/includes/user_loader.php b/phpBB/phpbb/user_loader.php
index 37bf9648c1..37bf9648c1 100644
--- a/phpBB/includes/user_loader.php
+++ b/phpBB/phpbb/user_loader.php