mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00
Code Issues Releases Wiki Activity

Merge PR #1130 branch 'EXreaction/ticket/11259' into develop

Browse Source 
* EXreaction/ticket/11259:
  [ticket/11259] htmlspecialchars($phpbb_admin_path)
  [ticket/11259] adm_relative_path -> phpbb_adm_relative_path
  [ticket/11259] Also make adm_relative_path available in the container
  [ticket/11259] Make phpbb_admin_path available everywhere

Conflicts:
	phpBB/install/index.php
	phpBB/install/install_update.php
This commit is contained in:
Oleg Pudeyev
2012-12-29 13:45:40 -05:00
parent f9354b98d8 61391f648c
commit 4dcc8cabae
19 changed files with 63 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
phpBB/includes/di/extension/config.php
View File

@@ -42,6 +42,7 @@ class phpbb_di_extension_config extends Extension
{
require($this->config_file);
$container->setParameter('core.adm_relative_path', (isset($phpbb_adm_relative_path) ? $phpbb_adm_relative_path : 'adm/'));
$container->setParameter('core.table_prefix', $table_prefix);
$container->setParameter('cache.driver.class', $this->convert_30_acm_type($acm_type));
$container->setParameter('dbal.driver.class', phpbb_convert_30_dbms_to_31($dbms));