aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/install
diff options
context:
space:
mode:
authorIgor Wiedler <igor@wiedler.ch>2012-03-11 15:14:13 +0100
committerIgor Wiedler <igor@wiedler.ch>2012-03-11 15:15:33 +0100
commite02d92ac62fbe1dc08994444c18a7447d72c56e6 (patch)
treeee96cc57586f4b3c4e2998d6ad0d747c5db189a7 /phpBB/install
parent5dd5df46a497631b905f6595707b0d1b0c302749 (diff)
downloadforums-e02d92ac62fbe1dc08994444c18a7447d72c56e6.tar
forums-e02d92ac62fbe1dc08994444c18a7447d72c56e6.tar.gz
forums-e02d92ac62fbe1dc08994444c18a7447d72c56e6.tar.bz2
forums-e02d92ac62fbe1dc08994444c18a7447d72c56e6.tar.xz
forums-e02d92ac62fbe1dc08994444c18a7447d72c56e6.zip
[feature/event-dispatcher] Use real EventDispatcher through composer
* replace the copy-pasta EventDispatcher with the real one from Symfony2 * use composer for managing this dependency, use composer autoloading PHPBB3-9550
Diffstat (limited to 'phpBB/install')
-rw-r--r--phpBB/install/database_update.php2
-rw-r--r--phpBB/install/index.php2
2 files changed, 4 insertions, 0 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 843e8c2f23..a1c8fe1ef9 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -82,6 +82,8 @@ if (!empty($load_extensions) && function_exists('dl'))
}
}
+require($phpbb_root_path . 'vendor/.composer/autoload.php');
+
// Include files
require($phpbb_root_path . 'includes/class_loader.' . $phpEx);
require($phpbb_root_path . 'includes/session.' . $phpEx);
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 9d003ba6ab..7e150c2519 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -69,6 +69,8 @@ else
}
@ini_set('memory_limit', $mem_limit);
+require($phpbb_root_path . 'vendor/.composer/autoload.php');
+
// Include essential scripts
require($phpbb_root_path . 'includes/class_loader.' . $phpEx);
require($phpbb_root_path . 'includes/functions.' . $phpEx);