makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix Bug #53185 (icon width/height adjustement for icons > 127px also applied on smilies) - related to r10088

Browse source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10234 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2009-10-26 13:59:02 +00:00
parent 6d1c40f6e6
commit 6ca7b21dc9
1 changed files with 27 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
phpBB/includes/acp/acp_icons.php
View file

@ -89,16 +89,19 @@ class acp_icons
continue; continue;
} }
// adjust the width and height to be lower than 128px while perserving the aspect ratio // adjust the width and height to be lower than 128px while perserving the aspect ratio (for icons)
if ($img_size[0] > 127 && $img_size[0] > $img_size[1]) if ($mode == 'icons')
{ {
$img_size[1] = (int) ($img_size[1] * (127 / $img_size[0])); if ($img_size[0] > 127 && $img_size[0] > $img_size[1])
$img_size[0] = 127; {
} $img_size[1] = (int) ($img_size[1] * (127 / $img_size[0]));
else if ($img_size[1] > 127) $img_size[0] = 127;
{ }
$img_size[0] = (int) ($img_size[0] * (127 / $img_size[1])); else if ($img_size[1] > 127)
$img_size[1] = 127; {
$img_size[0] = (int) ($img_size[0] * (127 / $img_size[1]));
$img_size[1] = 127;
}
} }
$_images[$path . $img]['file'] = $path . $img; $_images[$path . $img]['file'] = $path . $img;
@ -363,7 +366,7 @@ class acp_icons
if ($mode == 'smilies' && $action == 'create') if ($mode == 'smilies' && $action == 'create')
{ {
$smiley_count = $this->item_count($table); $smiley_count = $this->item_count($table);
$addable_smileys_count = sizeof($images); $addable_smileys_count = sizeof($images);
foreach ($images as $image) foreach ($images as $image)
{ {
@ -372,7 +375,7 @@ class acp_icons
--$addable_smileys_count; --$addable_smileys_count;
} }
} }
if ($smiley_count + $addable_smileys_count > SMILEY_LIMIT) if ($smiley_count + $addable_smileys_count > SMILEY_LIMIT)
{ {
trigger_error(sprintf($user->lang['TOO_MANY_SMILIES'], SMILEY_LIMIT) . adm_back_link($this->u_action), E_USER_WARNING); trigger_error(sprintf($user->lang['TOO_MANY_SMILIES'], SMILEY_LIMIT) . adm_back_link($this->u_action), E_USER_WARNING);
@ -400,15 +403,19 @@ class acp_icons
$image_height[$image] = $img_size[1]; $image_height[$image] = $img_size[1];
} }
if ($image_width[$image] > 127 && $image_width[$image] > $image_height[$image]) // Adjust image width/height for icons
if ($mode == 'icons')
{ {
$image_height[$image] = (int) ($image_height[$image] * (127 / $image_width[$image])); if ($image_width[$image] > 127 && $image_width[$image] > $image_height[$image])
$image_width[$image] = 127; {
} $image_height[$image] = (int) ($image_height[$image] * (127 / $image_width[$image]));
else if ($image_height[$image] > 127) $image_width[$image] = 127;
{ }
$image_width[$image] = (int) ($image_width[$image] * (127 / $image_height[$image])); else if ($image_height[$image] > 127)
$image_height[$image] = 127; {
$image_width[$image] = (int) ($image_width[$image] * (127 / $image_height[$image]));
$image_height[$image] = 127;
}
} }
$img_sql = array( $img_sql = array(
@ -923,7 +930,7 @@ class acp_icons
generate_pagination($this->u_action, $item_count, $config['smilies_per_page'], $pagination_start, true) generate_pagination($this->u_action, $item_count, $config['smilies_per_page'], $pagination_start, true)
); );
} }
/** /**
* Returns the count of smilies or icons in the database * Returns the count of smilies or icons in the database
* *