aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_icons.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-08-13 14:08:23 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-08-13 14:08:23 +0000
commit125b1dde8addabe2c0d6da3f88be32d1e27e6d05 (patch)
treedeb80fcdd1b20fcb52f847db2430e9b00ab02145 /phpBB/includes/acp/acp_icons.php
parent559ff6c678bc0ad2a07b34d0534012282b3d1dfa (diff)
downloadforums-125b1dde8addabe2c0d6da3f88be32d1e27e6d05.tar
forums-125b1dde8addabe2c0d6da3f88be32d1e27e6d05.tar.gz
forums-125b1dde8addabe2c0d6da3f88be32d1e27e6d05.tar.bz2
forums-125b1dde8addabe2c0d6da3f88be32d1e27e6d05.tar.xz
forums-125b1dde8addabe2c0d6da3f88be32d1e27e6d05.zip
re-allow editing icons and smilies. :/
git-svn-id: file:///svn/phpbb/trunk@6290 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_icons.php')
-rw-r--r--phpBB/includes/acp/acp_icons.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_icons.php b/phpBB/includes/acp/acp_icons.php
index 66aec3a90d..8c846d28ab 100644
--- a/phpBB/includes/acp/acp_icons.php
+++ b/phpBB/includes/acp/acp_icons.php
@@ -60,7 +60,7 @@ class acp_icons
if ($action == 'edit' || $action == 'add' || $action == 'import')
{
$imglist = filelist($phpbb_root_path . $img_path, '');
-
+
foreach ($imglist as $path => $img_ary)
{
foreach ($img_ary as $img)
@@ -108,6 +108,7 @@ class acp_icons
ORDER BY {$fields}_order " . (($icon_id || $action == 'add') ? 'DESC' : 'ASC');
$result = $db->sql_query($sql);
+ $data = array();
while ($row = $db->sql_fetchrow($result))
{
if ($action == 'add')
@@ -142,7 +143,6 @@ class acp_icons
$order_list = '<option value="1"' . ((!isset($after)) ? ' selected="selected"' : '') . '>' . $user->lang['FIRST'] . '</option>' . $order_list;
- $data = array();
if ($action == 'add')
{
$data = $_images;