diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-05-20 14:20:12 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-05-20 14:20:12 +0000 |
| commit | dbb6b3f6cf182579cac5bd0baf4f34744d0b1153 (patch) | |
| tree | 8191075d52ad8907c8baea69475daafc957e6c0a /phpBB/includes/acp | |
| parent | f77c0f0541f1c37b8d4f526857a5a288f84042d5 (diff) | |
| download | forums-dbb6b3f6cf182579cac5bd0baf4f34744d0b1153.tar forums-dbb6b3f6cf182579cac5bd0baf4f34744d0b1153.tar.gz forums-dbb6b3f6cf182579cac5bd0baf4f34744d0b1153.tar.bz2 forums-dbb6b3f6cf182579cac5bd0baf4f34744d0b1153.tar.xz forums-dbb6b3f6cf182579cac5bd0baf4f34744d0b1153.zip | |
- actually let the user import smilies/icons paks. ;)
- fix TRUNCATE TABLE syntax (mssql does not understand TRUNCATE alone)
git-svn-id: file:///svn/phpbb/trunk@5944 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp')
| -rw-r--r-- | phpBB/includes/acp/acp_icons.php | 3 |
1 files changed, 2 insertions, 1 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) { |