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 branch 'feature/migrations-data' of github.com:EXreaction/phpbb3 into feature/migrations-data

Browse Source 
# By Dhruv (19) and others
# Via Nathaniel Guse (3) and others
* 'feature/migrations-data' of github.com:EXreaction/phpbb3: (38 commits)
  [feature/migrations] Use the user class for language handling
  [feature/migrations] Fully revert the removal of the user_msnm field
  [feature/migrations] Revert unrelated change to schema_data.sql
  [ticket/11179] remove extra & in function call
  [ticket/11179] correct start parameter in sphinx search
  [ticket/11179] correct start parameter in native author search
  [ticket/11179] correct start parameter in native keyword search
  [ticket/11179] fix success query path for postgres
  [ticket/11179] fix success query path for mysql
  [ticket/11179] minor fixes
  [ticket/11179] pass start param by reference in postgres
  [ticket/11179] correct start param in author search of postgres
  [ticket/11179] correct start parameter in psql keyword search
  [ticket/11179] pass start param by reference in author search
  [ticket/11179] correct start parameter for author search
  [ticket/11179] use FOUND_ROWS query to re-search with changed start param
  [ticket/11179] pass start parameter by reference
  [ticket/11179] correct the start parameter while retrieving from cache
  [ticket/11179] add search query in case initial one fails
  [ticket/11359] html escape sphinx config data
  ...
This commit is contained in:
Nathaniel Guse
2013-02-25 13:12:57 -06:00
parent 7a8ae49300 f6a894f077
commit e632049e19
27 changed files with 440 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/install/install_install.php
View File

@@ -1457,12 +1457,12 @@ class install_install extends module
*/
function add_modules($mode, $sub)
{
global $db, $lang, $phpbb_root_path, $phpEx, $phpbb_extension_manager, $config;
global $db, $lang, $phpbb_root_path, $phpEx, $phpbb_extension_manager, $config, $phpbb_container;
// modules require an extension manager
if (empty($phpbb_extension_manager))
{
$phpbb_extension_manager = new phpbb_extension_manager($db, $config, EXT_TABLE, $phpbb_root_path, ".$phpEx");
$phpbb_extension_manager = $phpbb_container->get('ext.manager');
}
include_once($phpbb_root_path . 'includes/acp/acp_modules.' . $phpEx);