diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2009-06-17 12:17:19 +0000 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2009-06-17 12:17:19 +0000 |
| commit | 0e5cc91d6bdcef2e50fd8f04b4d5fe2249015f24 (patch) | |
| tree | d19e5a794b2a81bb6af54967fdc445dbcee0b066 /phpBB/includes/acp/acp_ranks.php | |
| parent | afddcaecf2886cd8f2442a419623bb1447d81aba (diff) | |
| download | forums-0e5cc91d6bdcef2e50fd8f04b4d5fe2249015f24.tar forums-0e5cc91d6bdcef2e50fd8f04b4d5fe2249015f24.tar.gz forums-0e5cc91d6bdcef2e50fd8f04b4d5fe2249015f24.tar.bz2 forums-0e5cc91d6bdcef2e50fd8f04b4d5fe2249015f24.tar.xz forums-0e5cc91d6bdcef2e50fd8f04b4d5fe2249015f24.zip | |
Fix bug #22665 - Display and highlight already used rank images while assigning new rank
Authorised by: acydburn
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9607 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_ranks.php')
| -rw-r--r-- | phpBB/includes/acp/acp_ranks.php | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/phpBB/includes/acp/acp_ranks.php b/phpBB/includes/acp/acp_ranks.php index 41ed5b0fba..a1a10545ef 100644 --- a/phpBB/includes/acp/acp_ranks.php +++ b/phpBB/includes/acp/acp_ranks.php @@ -168,25 +168,22 @@ class acp_ranks { $img = $path . $img; - if (!in_array($img, $existing_imgs) || $action == 'edit') + if ($ranks && $img == $ranks['rank_image']) { - if ($ranks && $img == $ranks['rank_image']) - { - $selected = ' selected="selected"'; - $edit_img = $img; - } - else - { - $selected = ''; - } - - if (strlen($img) > 255) - { - continue; - } - - $filename_list .= '<option value="' . htmlspecialchars($img) . '"' . $selected . '>' . $img . '</option>'; + $selected = ' selected="selected"'; + $edit_img = $img; } + else + { + $selected = ''; + } + + if (strlen($img) > 255) + { + continue; + } + + $filename_list .= '<option value="' . htmlspecialchars($img) . '"' . $selected . '>' . $img . ((in_array($img, $existing_imgs)) ? ' ' . $user->lang['RANK_IMAGE_IN_USE'] : '') . '</option>'; } } |