mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.2.x'

Browse Source
This commit is contained in:
Marc Alexander
2016-11-17 09:56:59 +01:00
parent 32667f6290 9343317121
commit 82960414f7
28 changed files with 11 additions and 730 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/includes/acp/acp_database.php
View File

@@ -115,7 +115,6 @@ class acp_database
// We might wanna empty out all that junk :D
switch ($db->get_sql_layer())
{
case 'sqlite':
case 'sqlite3':
$extractor->flush('DELETE FROM ' . $table_name . ";\n");
break;
@@ -304,7 +303,6 @@ class acp_database
case 'mysql':
case 'mysql4':
case 'mysqli':
case 'sqlite':
case 'sqlite3':
while (($sql = $fgetd($fp, ";\n", $read, $seek, $eof)) !== false)
{

1
phpBB/includes/acp/acp_icons.php
View File

@@ -563,7 +563,6 @@ class acp_icons
{
switch ($db->get_sql_layer())
{
case 'sqlite':
case 'sqlite3':
$db->sql_query('DELETE FROM ' . $table);
break;

2
phpBB/includes/acp/acp_main.php
View File

@@ -275,7 +275,6 @@ class acp_main
case 'db_track':
switch ($db->get_sql_layer())
{
case 'sqlite':
case 'sqlite3':
$db->sql_query('DELETE FROM ' . TOPICS_POSTED_TABLE);
break;
@@ -386,7 +385,6 @@ class acp_main
{
switch ($db->get_sql_layer())
{
case 'sqlite':
case 'sqlite3':
$db->sql_query("DELETE FROM $table");
break;

1
phpBB/includes/acp/acp_reasons.php
View File

@@ -250,7 +250,6 @@ class acp_reasons
// Teh standard
case 'postgres':
case 'oracle':
case 'sqlite':
case 'sqlite3':
// Change the reports using this reason to 'other'
$sql = 'UPDATE ' . REPORTS_TABLE . '

2
phpBB/includes/functions.php
View File

@@ -3510,7 +3510,7 @@ function obtain_guest_count($item_id = 0, $item = 'forum')
// Get number of online guests
if ($db->get_sql_layer() === 'sqlite' || $db->get_sql_layer() === 'sqlite3')
if ($db->get_sql_layer() === 'sqlite3')
{
$sql = 'SELECT COUNT(session_ip) as num_guests
FROM (

2
phpBB/includes/functions_admin.php
View File

@@ -2364,7 +2364,6 @@ function phpbb_cache_moderators($db, $cache, $auth)
// Clear table
switch ($db->get_sql_layer())
{
case 'sqlite':
case 'sqlite3':
$db->sql_query('DELETE FROM ' . MODERATOR_CACHE_TABLE);
break;
@@ -2822,7 +2821,6 @@ function get_database_size()
}
break;
case 'sqlite':
case 'sqlite3':
global $dbhost;

2
phpBB/includes/functions_convert.php
View File

@@ -1652,7 +1652,6 @@ function mass_auth($ug_type, $forum_id, $ug_id, $acl_list, $setting = ACL_NO)
$sql = 'VALUES ' . implode(', ', preg_replace('#^(.*?)$#', '(\1)', $sql_subary));
break;
case 'sqlite':
case 'sqlite3':
case 'mssqlnative':
$sql = implode(' UNION ALL ', preg_replace('#^(.*?)$#', 'SELECT \1', $sql_subary));
@@ -2040,7 +2039,6 @@ function update_topics_posted()
switch ($db->get_sql_layer())
{
case 'sqlite':
case 'sqlite3':
$db->sql_query('DELETE FROM ' . TOPICS_POSTED_TABLE);
break;