aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_icons.php
diff options
context:
space:
mode:
authorHenry Sudhof <kellanved@phpbb.com>2007-07-10 11:47:48 +0000
committerHenry Sudhof <kellanved@phpbb.com>2007-07-10 11:47:48 +0000
commitf538d70301a38cd65ca9d2463db0420c5eb1f3e0 (patch)
tree7a3e9db36d09284277371faacc1db8b3c70e0904 /phpBB/includes/acp/acp_icons.php
parent4fa1a7c8276d782b469471e062bab45fbfaa6e4f (diff)
downloadforums-f538d70301a38cd65ca9d2463db0420c5eb1f3e0.tar
forums-f538d70301a38cd65ca9d2463db0420c5eb1f3e0.tar.gz
forums-f538d70301a38cd65ca9d2463db0420c5eb1f3e0.tar.bz2
forums-f538d70301a38cd65ca9d2463db0420c5eb1f3e0.tar.xz
forums-f538d70301a38cd65ca9d2463db0420c5eb1f3e0.zip
#13199
git-svn-id: file:///svn/phpbb/trunk@7859 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_icons.php')
-rw-r--r--phpBB/includes/acp/acp_icons.php9
1 files changed, 5 insertions, 4 deletions
diff --git a/phpBB/includes/acp/acp_icons.php b/phpBB/includes/acp/acp_icons.php
index ebf058850f..f37448032e 100644
--- a/phpBB/includes/acp/acp_icons.php
+++ b/phpBB/includes/acp/acp_icons.php
@@ -189,6 +189,7 @@ class acp_icons
$db->sql_freeresult($result);
$order_list = '<option value="1"' . ((!isset($after)) ? ' selected="selected"' : '') . '>' . $user->lang['FIRST'] . '</option>' . $order_list;
+ $add_order_list = '<option value="1">' . $user->lang['FIRST'] . '</option>' . $add_order_list;
if ($action == 'add')
{
@@ -336,7 +337,7 @@ class acp_icons
}
// Image_order holds the 'new' order value
- if (!empty($image_order[$image]) && !empty($$image_id[$image]))
+ if (!empty($image_order[$image]))
{
$img_sql = array_merge($img_sql, array(
$fields . '_order' => $image_order[$image])
@@ -363,19 +364,19 @@ class acp_icons
}
}
- if ($action == 'modify')
+ if ($action == 'modify' && !empty($image_id[$image]))
{
$sql = "UPDATE $table
SET " . $db->sql_build_array('UPDATE', $img_sql) . "
WHERE {$fields}_id = " . $image_id[$image];
$db->sql_query($sql);
}
- else
+ else if ($action !== 'modify')
{
$sql = "INSERT INTO $table " . $db->sql_build_array('INSERT', $img_sql);
$db->sql_query($sql);
}
- }
+ }
}
$cache->destroy('_icons');