diff options
| author | Jim Wigginton <terrafrost@phpbb.com> | 2009-09-02 05:12:23 +0000 |
|---|---|---|
| committer | Jim Wigginton <terrafrost@phpbb.com> | 2009-09-02 05:12:23 +0000 |
| commit | 73baf42558b70acf7b2e194a84172778374a1c6e (patch) | |
| tree | 2095e4069ff2921d6a4aa9b30e7123c92ecdd6fc /phpBB/includes/acp/acp_icons.php | |
| parent | 6134b641e395f1abd0a4fc71c50470ab93dea07e (diff) | |
| download | forums-73baf42558b70acf7b2e194a84172778374a1c6e.tar forums-73baf42558b70acf7b2e194a84172778374a1c6e.tar.gz forums-73baf42558b70acf7b2e194a84172778374a1c6e.tar.bz2 forums-73baf42558b70acf7b2e194a84172778374a1c6e.tar.xz forums-73baf42558b70acf7b2e194a84172778374a1c6e.zip | |
Fixed bugs #43145, #44375, #44415 and #43045
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10088 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_icons.php')
| -rw-r--r-- | phpBB/includes/acp/acp_icons.php | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/phpBB/includes/acp/acp_icons.php b/phpBB/includes/acp/acp_icons.php index fa1e324cc6..8213c55ccb 100644 --- a/phpBB/includes/acp/acp_icons.php +++ b/phpBB/includes/acp/acp_icons.php @@ -89,6 +89,18 @@ class acp_icons continue; } + // adjust the width and height to be lower than 128px while perserving the aspect ratio + if ($img_size[0] > 127 && $img_size[0] > $img_size[1]) + { + $img_size[1] = (int) ($img_size[1] * (127 / $img_size[0])); + $img_size[0] = 127; + } + else if ($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]['width'] = $img_size[0]; $_images[$path . $img]['height'] = $img_size[1]; @@ -388,6 +400,17 @@ class acp_icons $image_height[$image] = $img_size[1]; } + if ($image_width[$image] > 127 && $image_width[$image] > $image_height[$image]) + { + $image_height[$image] = (int) ($image_height[$image] * (127 / $image_width[$image])); + $image_width[$image] = 127; + } + else if ($image_height[$image] > 127) + { + $image_width[$image] = (int) ($image_width[$image] * (127 / $image_height[$image])); + $image_height[$image] = 127; + } + $img_sql = array( $fields . '_url' => $image, $fields . '_width' => $image_width[$image], |