diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-05-08 18:43:46 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-05-08 18:43:46 +0200 |
| commit | 8121f87f084c0e1790dd59105a00de8d4b3c7cdb (patch) | |
| tree | a9e2d9565cec2c9888390337852c64ab88284e4b /phpBB/includes/functions_install.php | |
| parent | bfd66ef2fdc1721ded267b6a0af3883f827840c1 (diff) | |
| parent | d4fc060bcd61228fdf78da4f2d290a7a17546c46 (diff) | |
| download | forums-8121f87f084c0e1790dd59105a00de8d4b3c7cdb.tar forums-8121f87f084c0e1790dd59105a00de8d4b3c7cdb.tar.gz forums-8121f87f084c0e1790dd59105a00de8d4b3c7cdb.tar.bz2 forums-8121f87f084c0e1790dd59105a00de8d4b3c7cdb.tar.xz forums-8121f87f084c0e1790dd59105a00de8d4b3c7cdb.zip | |
Merge branch 'develop-ascraeus' of github.com:phpbb/phpbb into ticket/12407
* 'develop-ascraeus' of github.com:phpbb/phpbb: (424 commits)
[ticket/12428] Use the database to store the original version number
[ticket/12493] Add functional test
[ticket/12493] Fix sql query for selection of users that have disabled PM
[ticket/12513] Add asset include support to simple header/footer in ACP
[ticket/12513] Add simple_header head event with support for CSS assets calls
[ticket/12511] Add missing titles for profile fields in members group view
[ticket/12428] Incorrect from version in database update log entry
[ticket/12510] Convert & to & in build_url() when no params are stripped.
[ticket/12402] CAPTCHA plugin migration fails to detect missing plugins
[ticket/12440] Use a more generic approach for replacing the URL.
[ticket/12507] Move the 'require' statement
[ticket/12507] Add console command to purge the cache
[ticket/12421] Rebase and enable tests
[ticket/12421] Don't parse [attachment] tags if user can't view them
[ticket/12325] Use \RecursiveDirectoryIterator
[ticket/12325] Doc blocks
[ticket/12440] Set browser URL to point to specific post when using view=unread
[ticket/12357] Support routes in generate_smilies() function.
[ticket/12459] Change language strings
[ticket/12504] Use local variables where possible
...
Conflicts:
phpBB/posting.php
Diffstat (limited to 'phpBB/includes/functions_install.php')
| -rw-r--r-- | phpBB/includes/functions_install.php | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/phpBB/includes/functions_install.php b/phpBB/includes/functions_install.php index 4f8ec99d88..f484461b77 100644 --- a/phpBB/includes/functions_install.php +++ b/phpBB/includes/functions_install.php @@ -106,6 +106,15 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20 'AVAILABLE' => true, '2.0.x' => false, ), + 'sqlite3' => array( + 'LABEL' => 'SQLite3', + 'SCHEMA' => 'sqlite', + 'MODULE' => 'sqlite3', + 'DELIM' => ';', + 'DRIVER' => 'phpbb\db\driver\sqlite3', + 'AVAILABLE' => true, + '2.0.x' => false, + ), ); if ($dbms) @@ -206,14 +215,14 @@ function connect_check_db($error_connect, &$error, $dbms_details, $table_prefix, $db->sql_return_on_error(true); // Check that we actually have a database name before going any further..... - if ($dbms_details['DRIVER'] != 'phpbb\db\driver\sqlite' && $dbms_details['DRIVER'] != 'phpbb\db\driver\oracle' && $dbname === '') + if ($dbms_details['DRIVER'] != 'phpbb\db\driver\sqlite' && $dbms_details['DRIVER'] != 'phpbb\db\driver\sqlite3' && $dbms_details['DRIVER'] != 'phpbb\db\driver\oracle' && $dbname === '') { $error[] = $lang['INST_ERR_DB_NO_NAME']; return false; } // Make sure we don't have a daft user who thinks having the SQLite database in the forum directory is a good idea - if ($dbms_details['DRIVER'] == 'phpbb\db\driver\sqlite' && stripos(phpbb_realpath($dbhost), phpbb_realpath('../')) === 0) + if (($dbms_details['DRIVER'] == 'phpbb\db\driver\sqlite' || $dbms_details['DRIVER'] == 'phpbb\db\driver\sqlite3') && stripos(phpbb_realpath($dbhost), phpbb_realpath('../')) === 0) { $error[] = $lang['INST_ERR_DB_FORUM_PATH']; return false; @@ -243,6 +252,7 @@ function connect_check_db($error_connect, &$error, $dbms_details, $table_prefix, break; case 'phpbb\db\driver\sqlite': + case 'phpbb\db\driver\sqlite3': $prefix_length = 200; break; @@ -299,6 +309,14 @@ function connect_check_db($error_connect, &$error, $dbms_details, $table_prefix, } break; + case 'phpbb\db\driver\sqlite3': + $version = \SQLite3::version(); + if (version_compare($version['versionString'], '3.6.15', '<')) + { + $error[] = $lang['INST_ERR_DB_NO_SQLITE3']; + } + break; + case 'phpbb\db\driver\firebird': // check the version of FB, use some hackery if we can't get access to the server info if ($db->service_handle !== false && function_exists('ibase_server_info')) |