aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/install/index.php
diff options
context:
space:
mode:
authorNathan Guse <nathaniel.guse@gmail.com>2013-07-13 22:47:41 -0700
committerNathan Guse <nathaniel.guse@gmail.com>2013-07-13 22:47:41 -0700
commit1e37d97909ccf52b08e2a809ea8a9365c824d8de (patch)
treea260c846cb47713e72de11cfb9803d981ea6faaf /phpBB/install/index.php
parent4186c05bb4b97374392031a10b796e77b857afaf (diff)
parent7030578bbe9e11c18b5becaf8b06e670e3c2e3cd (diff)
downloadforums-1e37d97909ccf52b08e2a809ea8a9365c824d8de.tar
forums-1e37d97909ccf52b08e2a809ea8a9365c824d8de.tar.gz
forums-1e37d97909ccf52b08e2a809ea8a9365c824d8de.tar.bz2
forums-1e37d97909ccf52b08e2a809ea8a9365c824d8de.tar.xz
forums-1e37d97909ccf52b08e2a809ea8a9365c824d8de.zip
Merge pull request #1559 from naderman/ticket/11698
[WIP][ticket/11698] Moving all autoloadable files to phpbb/
Diffstat (limited to 'phpBB/install/index.php')
-rw-r--r--phpBB/install/index.php4
1 files changed, 2 insertions, 2 deletions
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();