diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2012-12-09 21:02:31 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2012-12-09 21:02:31 +0100 |
| commit | 1aae72961a3205a8487218b6d69361c43a1297d6 (patch) | |
| tree | 3096a599c14c88084f782022f002ed84224ccf8b /phpBB/download/file.php | |
| parent | 26bde05a30c7111b57621a37d86425aa69d74263 (diff) | |
| parent | 3fe381eed561e724700b21789e28ea3efb1f7ef9 (diff) | |
| download | forums-1aae72961a3205a8487218b6d69361c43a1297d6.tar forums-1aae72961a3205a8487218b6d69361c43a1297d6.tar.gz forums-1aae72961a3205a8487218b6d69361c43a1297d6.tar.bz2 forums-1aae72961a3205a8487218b6d69361c43a1297d6.tar.xz forums-1aae72961a3205a8487218b6d69361c43a1297d6.zip | |
Merge branch 'develop' into feature/avatars
Conflicts:
phpBB/install/database_update.php
Diffstat (limited to 'phpBB/download/file.php')
| -rw-r--r-- | phpBB/download/file.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/phpBB/download/file.php b/phpBB/download/file.php index 70093db7dc..5dd0e1b1f3 100644 --- a/phpBB/download/file.php +++ b/phpBB/download/file.php @@ -42,8 +42,6 @@ if (isset($_GET['avatar'])) } require($phpbb_root_path . 'includes/class_loader.' . $phpEx); - require($phpbb_root_path . 'includes/di/processor/interface.' . $phpEx); - require($phpbb_root_path . 'includes/di/processor/config.' . $phpEx); require($phpbb_root_path . 'includes/db/' . $dbms . '.' . $phpEx); require($phpbb_root_path . 'includes/constants.' . $phpEx); @@ -66,6 +64,7 @@ if (isset($_GET['avatar'])) ), array( new phpbb_di_pass_collection_pass(), + new phpbb_di_pass_kernel_pass(), ), $phpbb_root_path, $phpEx |