1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-09 10:16:36 +02:00

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
This commit is contained in:
Andreas Fischer
2011-02-24 10:54:51 +01:00
3 changed files with 13 additions and 1 deletions

View File

@@ -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