mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-15 13:14:09 +02:00
Code Issues Releases Wiki Activity

Fix bug #22665 - Display and highlight already used rank images while assigning new rank

Browse Source 
Authorised by: acydburn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9607 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Joas Schilling
2009-06-17 12:17:19 +00:00
parent afddcaecf2
commit 0e5cc91d6b
3 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
phpBB/docs/CHANGELOG.html
View File

@@ -115,6 +115,7 @@
<li>[Fix] Exclude forum from active topics option is ignored (Bug #19135 - Patch by nickvergessen)</li> <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] 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] 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] 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] 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> <li>[Change] Template engine now permits to a limited extent variable includes.</li>

5
phpBB/includes/acp/acp_ranks.php
View File

@@ -168,8 +168,6 @@ class acp_ranks
{ {
$img = $path . $img; $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"'; $selected = ' selected="selected"';
@@ -185,8 +183,7 @@ class acp_ranks
continue; continue;
} }
$filename_list .= '<option value="' . htmlspecialchars($img) . '"' . $selected . '>' . $img . '</option>'; $filename_list .= '<option value="' . htmlspecialchars($img) . '"' . $selected . '>' . $img . ((in_array($img, $existing_imgs)) ? ' ' . $user->lang['RANK_IMAGE_IN_USE'] : '') . '</option>';
}
} }
} }

1
phpBB/language/en/acp/posting.php
View File

@@ -217,6 +217,7 @@ $lang = array_merge($lang, array(
'RANK_ADDED' => 'The rank was successfully added.', 'RANK_ADDED' => 'The rank was successfully added.',
'RANK_IMAGE' => 'Rank image', '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_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_MINIMUM' => 'Minimum posts',
'RANK_REMOVED' => 'The rank was successfully deleted.', 'RANK_REMOVED' => 'The rank was successfully deleted.',
'RANK_SPECIAL' => 'Set as special rank', 'RANK_SPECIAL' => 'Set as special rank',