diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-07-22 18:30:59 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-07-22 18:30:59 +0200 |
| commit | 0f18ff6228261ef57fea5ead000552780b572733 (patch) | |
| tree | 1b1916db11fb9cf9bb945c9ca116b35a75502c5f /phpBB | |
| parent | 1d050635d20c4a7b0033aae91eb384e71fd25f3f (diff) | |
| parent | 128af41a7ce983a1b54406e5c467e40b14af7afc (diff) | |
| download | forums-0f18ff6228261ef57fea5ead000552780b572733.tar forums-0f18ff6228261ef57fea5ead000552780b572733.tar.gz forums-0f18ff6228261ef57fea5ead000552780b572733.tar.bz2 forums-0f18ff6228261ef57fea5ead000552780b572733.tar.xz forums-0f18ff6228261ef57fea5ead000552780b572733.zip | |
Merge remote-tracking branch 'marc1706/ticket/11725' into develop
* marc1706/ticket/11725:
[ticket/11725] Use new paths for phpbb_class_loader in file.php
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/download/file.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/download/file.php b/phpBB/download/file.php index cf7128b25b..5a091db7c7 100644 --- a/phpBB/download/file.php +++ b/phpBB/download/file.php @@ -41,7 +41,7 @@ if (isset($_GET['avatar'])) exit; } - require($phpbb_root_path . 'includes/class_loader.' . $phpEx); + require($phpbb_root_path . 'phpbb/class_loader.' . $phpEx); require($phpbb_root_path . 'includes/constants.' . $phpEx); require($phpbb_root_path . 'includes/functions.' . $phpEx); @@ -50,7 +50,7 @@ if (isset($_GET['avatar'])) require($phpbb_root_path . 'includes/utf/utf_tools.' . $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(); |