diff options
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_icons.php | 3 | ||||
| -rw-r--r-- | phpBB/includes/functions_admin.php | 3 | ||||
| -rw-r--r-- | phpBB/includes/search/fulltext_mysql.php | 4 | ||||
| -rwxr-xr-x | phpBB/includes/search/fulltext_native.php | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/phpBB/includes/acp/acp_icons.php b/phpBB/includes/acp/acp_icons.php index 35b41f0ae1..0db02be9cb 100644 --- a/phpBB/includes/acp/acp_icons.php +++ b/phpBB/includes/acp/acp_icons.php @@ -27,6 +27,7 @@ class acp_icons $action = request_var('action', ''); $action = (isset($_POST['add'])) ? 'add' : $action; $action = (isset($_POST['edit'])) ? 'edit' : $action; + $action = (isset($_POST['import'])) ? 'import' : $action; $icon_id = request_var('id', 0); $this->tpl_name = 'acp_icons'; @@ -328,7 +329,7 @@ class acp_icons // The user has already selected a smilies_pak file if ($current == 'delete') { - $db->sql_query("TRUNCATE $table"); + $db->sql_query(((SQL_LAYER != 'sqlite') ? 'TRUNCATE TABLE ' : 'DELETE FROM ') . $table); switch ($mode) { diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php index 9010599d0b..15d5ef6a45 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -1811,8 +1811,7 @@ function cache_moderators() global $db, $cache, $auth, $phpbb_root_path, $phpEx; // Clear table - $sql = (SQL_LAYER != 'sqlite') ? 'TRUNCATE ' . MODERATOR_TABLE : 'DELETE FROM ' . MODERATOR_TABLE; - $db->sql_query($sql); + $db->sql_query(((SQL_LAYER != 'sqlite') ? 'TRUNCATE TABLE ' : 'DELETE FROM ') . MODERATOR_TABLE); // We add moderators who have forum moderator permissions without an explicit ACL_NO setting $hold_ary = $ug_id_ary = $sql_ary = array(); diff --git a/phpBB/includes/search/fulltext_mysql.php b/phpBB/includes/search/fulltext_mysql.php index af44b98ded..86ee938d66 100644 --- a/phpBB/includes/search/fulltext_mysql.php +++ b/phpBB/includes/search/fulltext_mysql.php @@ -647,7 +647,7 @@ class fulltext_mysql extends search_backend $db->sql_query('ALTER TABLE ' . POSTS_TABLE . ' ADD FULLTEXT (post_text)'); } - $db->sql_query('TRUNCATE ' . SEARCH_TABLE); + $db->sql_query('TRUNCATE TABLE ' . SEARCH_TABLE); } /** @@ -678,7 +678,7 @@ class fulltext_mysql extends search_backend $db->sql_query('ALTER TABLE ' . POSTS_TABLE . ' DROP INDEX post_text'); } - $db->sql_query('TRUNCATE ' . SEARCH_TABLE); + $db->sql_query('TRUNCATE TABLE ' . SEARCH_TABLE); } /** diff --git a/phpBB/includes/search/fulltext_native.php b/phpBB/includes/search/fulltext_native.php index 52f56a0450..2c50c5f9fd 100755 --- a/phpBB/includes/search/fulltext_native.php +++ b/phpBB/includes/search/fulltext_native.php @@ -990,9 +990,9 @@ class fulltext_native extends search_backend { global $db; - $db->sql_query(((SQL_LAYER != 'sqlite') ? 'TRUNCATE ' : 'DELETE FROM ') . SEARCH_WORD_TABLE); - $db->sql_query(((SQL_LAYER != 'sqlite') ? 'TRUNCATE ' : 'DELETE FROM ') . SEARCH_MATCH_TABLE); - $db->sql_query(((SQL_LAYER != 'sqlite') ? 'TRUNCATE ' : 'DELETE FROM ') . SEARCH_TABLE); + $db->sql_query(((SQL_LAYER != 'sqlite') ? 'TRUNCATE TABLE ' : 'DELETE FROM ') . SEARCH_WORD_TABLE); + $db->sql_query(((SQL_LAYER != 'sqlite') ? 'TRUNCATE TABLE ' : 'DELETE FROM ') . SEARCH_MATCH_TABLE); + $db->sql_query(((SQL_LAYER != 'sqlite') ? 'TRUNCATE TABLE ' : 'DELETE FROM ') . SEARCH_TABLE); } /** |