diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-02-24 10:54:51 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-02-24 10:54:51 +0100 |
| commit | cf5253c7b8407b7ff1c998aae9408c112b90cf05 (patch) | |
| tree | d3d0f95a05dea98bf702d140212678831d24b900 /phpBB/install | |
| parent | ba41e45f84027ebcf8d5118f909cee2bf0b4ddd5 (diff) | |
| parent | 5e2bbdb22b82102c9bb2a1f040ad2755e545941e (diff) | |
| download | forums-cf5253c7b8407b7ff1c998aae9408c112b90cf05.tar forums-cf5253c7b8407b7ff1c998aae9408c112b90cf05.tar.gz forums-cf5253c7b8407b7ff1c998aae9408c112b90cf05.tar.bz2 forums-cf5253c7b8407b7ff1c998aae9408c112b90cf05.tar.xz forums-cf5253c7b8407b7ff1c998aae9408c112b90cf05.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10056] Corrected a typo in Firebird name.
[ticket/10041] Use send_status_line more in download/file.php
Conflicts:
phpBB/download/file.php
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/database_update.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 6d744502e1..fab79e6dc1 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -231,7 +231,7 @@ if (empty($config['dbms_version'])) set_config('dbms_version', $db->sql_server_info(true)); } -// Firebird update from Firebord 2.0 to 2.1+ required? +// Firebird update from Firebird 2.0 to 2.1+ required? if ($db->sql_layer == 'firebird') { // We do not trust any PHP5 function enabled, we will simply test for a function new in 2.1 |