diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-06-12 23:19:46 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-06-12 23:19:46 +0200 |
| commit | 8453587264e4130b9d6397b9a18c561c9f8830a9 (patch) | |
| tree | dca300b54b528bbbc4243c31bb6e8162d858be41 /phpBB/install/database_update.php | |
| parent | f9f5909f9a45ca195b24c93addf7137cb827cbe5 (diff) | |
| parent | d724c3afac8feb174c412d4444b5cb747982de2e (diff) | |
| download | forums-8453587264e4130b9d6397b9a18c561c9f8830a9.tar forums-8453587264e4130b9d6397b9a18c561c9f8830a9.tar.gz forums-8453587264e4130b9d6397b9a18c561c9f8830a9.tar.bz2 forums-8453587264e4130b9d6397b9a18c561c9f8830a9.tar.xz forums-8453587264e4130b9d6397b9a18c561c9f8830a9.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9992] The table name constant needs to be defined in the updater
Diffstat (limited to 'phpBB/install/database_update.php')
| -rw-r--r-- | phpBB/install/database_update.php | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index d181c6320b..db535fbddb 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -76,6 +76,13 @@ require($phpbb_root_path . 'includes/constants.' . $phpEx); require($phpbb_root_path . 'includes/db/' . $dbms . '.' . $phpEx); require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx); +// new table constants are separately defined here in case the updater is run +// before the files are updated +if (!defined('LOGIN_ATTEMPT_TABLE')) +{ + define('LOGIN_ATTEMPT_TABLE', $table_prefix . 'login_attempts'); +} + // If we are on PHP >= 6.0.0 we do not need some code if (version_compare(PHP_VERSION, '6.0.0-dev', '>=')) { |