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 | |
| 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
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_ranks.php | 31 | ||||
| -rw-r--r-- | phpBB/language/en/acp/posting.php | 1 |
3 files changed, 16 insertions, 17 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 651cb54fa7..1df5930862 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -115,6 +115,7 @@ <li>[Fix] Exclude forum from active topics option is ignored (Bug #19135 - Patch by nickvergessen)</li> <li>[Fix] Do not display birthdays of banned users (Bug #20625 - Patch by nickvergessen)</li> <li>[Fix] Fix function to recalculate Nested Sets (Bug #41555 - Patch by EXreaction)</li> + <li>[Fix] Already used rank-images missing in image-list when creating new rank (Bug #22665 - Patch by nickvergessen)</li> <li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li> <li>[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li> <li>[Change] Template engine now permits to a limited extent variable includes.</li> 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>'; } } diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php index 01453b85ef..cfb626d186 100644 --- a/phpBB/language/en/acp/posting.php +++ b/phpBB/language/en/acp/posting.php @@ -217,6 +217,7 @@ $lang = array_merge($lang, array( 'RANK_ADDED' => 'The rank was successfully added.', 'RANK_IMAGE' => 'Rank image', 'RANK_IMAGE_EXPLAIN' => 'Use this to define a small image associated with the rank. The path is relative to the root phpBB directory.', + 'RANK_IMAGE_IN_USE' => '(In use)', 'RANK_MINIMUM' => 'Minimum posts', 'RANK_REMOVED' => 'The rank was successfully deleted.', 'RANK_SPECIAL' => 'Set as special rank', |