diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-01-16 16:15:31 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-01-16 16:15:31 +0100 |
| commit | 19b6ea8cf748034c041f88370bac620924fe1d7b (patch) | |
| tree | 83fc9d93e6ea24db857a0aaf6e8948cbd4982ca9 /phpBB/common.php | |
| parent | 37014abd022be4f7824a590b93a329f74aef442c (diff) | |
| parent | f63e115ae90edb9d65bc3bb23fc4d3c0ce81b763 (diff) | |
| download | forums-19b6ea8cf748034c041f88370bac620924fe1d7b.tar forums-19b6ea8cf748034c041f88370bac620924fe1d7b.tar.gz forums-19b6ea8cf748034c041f88370bac620924fe1d7b.tar.bz2 forums-19b6ea8cf748034c041f88370bac620924fe1d7b.tar.xz forums-19b6ea8cf748034c041f88370bac620924fe1d7b.zip | |
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10714
* 'develop' of https://github.com/phpbb/phpbb3: (205 commits)
[ticket/10786] Javascript toggle member search panel in memberlist.php
[ticket/10786] Javascript toggle member search panel in memberlist.php
[ticket/10786] Javascript toggle member search panel in memberlist.php
[ticket/11201] Remove database column on update
[ticket/10431] Remove .left class from reply-all
[ticket/10431] Remove reply-all custom css
[ticket/10431] Adjustments for large buttons
[ticket/11323] Add tests for inclusion of defined variables
[ticket/11324] Add PHP 5.5 environment to travis and allow it to fail.
[ticket/11201] Remove MSN/WLM fields
[ticket/11321] Recreate schema files with develop/create_schema_files.php
[ticket/11320] Include functions file as we need phpbb_convert_30_dbms_to_31
[ticket/11313] Use correct object el instead of eel in alt_text callback
[ticket/11301] Guidelines: Add spaces in front and after the / operator.
[ticket/11301] Explicitly cast str offset to int to prevent E_NOTICE on 5.4.
[ticket/11311] Include asset core.js in subsilver2 overall_footer.html
[ticket/10949] Remove not needed comma
[ticket/11309] phpbb_extension_interface::disable_step correct docblock.
[ticket/10949] Converted missing code to new JS coding guidelines
[ticket/11302] Correctly select first timezone or selected timezone
...
Diffstat (limited to 'phpBB/common.php')
| -rw-r--r-- | phpBB/common.php | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/phpBB/common.php b/phpBB/common.php index d657d77e93..2ba126330a 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -63,6 +63,10 @@ if (!defined('PHPBB_INSTALLED')) exit; } +// In case $phpbb_adm_relative_path is not set (in case of an update), use the default. +$phpbb_adm_relative_path = (isset($phpbb_adm_relative_path)) ? $phpbb_adm_relative_path : 'adm/'; +$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); @@ -83,18 +87,7 @@ $phpbb_class_loader_ext = new phpbb_class_loader('phpbb_ext_', "{$phpbb_root_pat $phpbb_class_loader_ext->register(); // Set up container -$phpbb_container = phpbb_create_dumped_container_unless_debug( - array( - new phpbb_di_extension_config($phpbb_root_path . 'config.' . $phpEx), - new phpbb_di_extension_core($phpbb_root_path), - ), - array( - new phpbb_di_pass_collection_pass(), - new phpbb_di_pass_kernel_pass(), - ), - $phpbb_root_path, - $phpEx -); +$phpbb_container = phpbb_create_default_container($phpbb_root_path, $phpEx); $phpbb_class_loader->set_cache($phpbb_container->get('cache.driver')); $phpbb_class_loader_ext->set_cache($phpbb_container->get('cache.driver')); @@ -129,8 +122,9 @@ $phpbb_style = $phpbb_container->get('style'); // Add own hook handler require($phpbb_root_path . 'includes/hooks/index.' . $phpEx); $phpbb_hook = new phpbb_hook(array('exit_handler', 'phpbb_user_session_handler', 'append_sid', array('phpbb_template', 'display'))); +$phpbb_hook_finder = $phpbb_container->get('hook_finder'); -foreach ($cache->obtain_hooks() as $hook) +foreach ($phpbb_hook_finder->find() as $hook) { @include($phpbb_root_path . 'includes/hooks/' . $hook . '.' . $phpEx); } |