diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-02-25 16:04:22 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-02-25 16:04:22 +0100 |
| commit | c2974187e53e1da2516075581b854a6dc3a95a6f (patch) | |
| tree | 90e3bcb580d2f512146993d8b42d96142e26d920 /phpBB/install/database_update.php | |
| parent | c1b4cdb1883bb6771a303624ece131eb5c7f071d (diff) | |
| parent | 558ecdcd40fb13bb264839c210996c47e3e81bcb (diff) | |
| download | forums-c2974187e53e1da2516075581b854a6dc3a95a6f.tar forums-c2974187e53e1da2516075581b854a6dc3a95a6f.tar.gz forums-c2974187e53e1da2516075581b854a6dc3a95a6f.tar.bz2 forums-c2974187e53e1da2516075581b854a6dc3a95a6f.tar.xz forums-c2974187e53e1da2516075581b854a6dc3a95a6f.zip | |
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10714
* 'develop' of https://github.com/phpbb/phpbb3: (119 commits)
[ticket/10986] message.id fallback to SERVER_NAME or phpbb.generated
[ticket/11358] Changed the name of post parameter.
[ticket/11358] Changed the action parameter value to represent the link.
[ticket/11358] Enabled link making all users default for a group.
[ticket/11358] Removed redundant code and referred proper variable.
[ticket/11358] Success message even without selecting a user.
[ticket/11355] Referred proper variable when validating selection.
[ticket/11355] Wrong error message when no user is selected.
[ticket/10896] Add missing email validation lost in develop merge
[ticket/7262] Add note about set_config() not updating is_dynamic.
[ticket/7262] Add $is_dynamic example to set_config() and set_config_count().
[ticket/7262] Backport set_config() and set_config_count() docs from develop.
[ticket/11122] Move rxu to 'Former Contributors' section.
[ticket/11122] Add EXreaction to docs/AUTHORS.
[ticket/11298] Fix typo in language key; EXTENSIONS -> EXTENSION
[ticket/11361] Make sure that array passed to strtr() has the proper format.
[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
...
Conflicts:
phpBB/config/tables.yml
Diffstat (limited to 'phpBB/install/database_update.php')
| -rw-r--r-- | phpBB/install/database_update.php | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 4a61d189a3..0a065573bf 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -685,12 +685,12 @@ function _write_result($no_updates, $errored, $error_ary) function _add_modules($modules_to_install) { - global $phpbb_root_path, $phpEx, $db, $phpbb_extension_manager, $config; + global $phpbb_root_path, $phpEx, $db, $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); @@ -1196,11 +1196,6 @@ function database_update_info() 'user_timezone' => array('VCHAR:100', ''), ), ), - 'drop_columns' => array( - USERS_TABLE => array( - 'user_msnm', - ), - ), ), ); } |