diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-11-17 09:56:51 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-11-17 09:56:51 +0100 |
| commit | 9343317121504ef6b558f81126ce93adb6f33ecd (patch) | |
| tree | 272aa875857cad890a8433f4947d9090ffb6987c /phpBB/develop | |
| parent | c6bed98cf508f4dfd6e0ec1762768b238a1c6ee3 (diff) | |
| parent | e974f338afb86c065e9b160363bc2e6156f8566d (diff) | |
| download | forums-9343317121504ef6b558f81126ce93adb6f33ecd.tar forums-9343317121504ef6b558f81126ce93adb6f33ecd.tar.gz forums-9343317121504ef6b558f81126ce93adb6f33ecd.tar.bz2 forums-9343317121504ef6b558f81126ce93adb6f33ecd.tar.xz forums-9343317121504ef6b558f81126ce93adb6f33ecd.zip | |
Merge remote-tracking branch 'senky/ticket/14739' into 3.2.x
Diffstat (limited to 'phpBB/develop')
| -rw-r--r-- | phpBB/develop/add_permissions.php | 1 | ||||
| -rw-r--r-- | phpBB/develop/create_schema_files.php | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/phpBB/develop/add_permissions.php b/phpBB/develop/add_permissions.php index 697dbdbaca..c575729d91 100644 --- a/phpBB/develop/add_permissions.php +++ b/phpBB/develop/add_permissions.php @@ -379,7 +379,6 @@ function mass_auth($ug_type, $forum_id, $ug_id, $acl_list, $setting) $sql = 'VALUES ' . implode(', ', preg_replace('#^(.*?)$#', '(\1)', $sql_subary)); break; - case 'sqlite': case 'sqlite3': $sql = implode(' UNION ALL ', preg_replace('#^(.*?)$#', 'SELECT \1', $sql_subary)); break; diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index 09bc4c4085..6e0a082045 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -49,7 +49,7 @@ $classes = $finder->core_path('phpbb/') ->directory('/db/migration/data') ->get_classes(); -$db = new \phpbb\db\driver\sqlite(); +$db = new \phpbb\db\driver\sqlite3(); $factory = new \phpbb\db\tools\factory(); $db_tools = $factory->get($db, true); |