aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2009-04-17 15:35:56 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2009-04-17 15:35:56 +0000
commit87f1ef1e9137bf9d86445802497e22aa10092447 (patch)
tree548e8df943413ac93a172d40956014c0473bae83 /phpBB
parenta7be268aa64b9542cf3be2dccd7163091dc8cbc6 (diff)
downloadforums-87f1ef1e9137bf9d86445802497e22aa10092447.tar
forums-87f1ef1e9137bf9d86445802497e22aa10092447.tar.gz
forums-87f1ef1e9137bf9d86445802497e22aa10092447.tar.bz2
forums-87f1ef1e9137bf9d86445802497e22aa10092447.tar.xz
forums-87f1ef1e9137bf9d86445802497e22aa10092447.zip
Do not create thumbnail if thumbnail would've the same size as the original image. (Bug #30725)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9462 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/docs/CHANGELOG.html1
-rw-r--r--phpBB/includes/functions_posting.php2
2 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 529fab3f01..875281d5d2 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -141,6 +141,7 @@
<li>[Fix] Messenger now also able to use a custom language path. (Bug #36545)</li>
<li>[Fix] PM Export uses ISO 8601 date now. (Bug #32645)</li>
<li>[Fix] Apply append_sid() to newest/latest post links in viewforum/search and UCP main module. (Bug #26815)</li>
+ <li>[Fix] Do not create thumbnail if thumbnail would've the same size as the original image. (Bug #30725)</li>
<li>[Change] Default difference view is now 'inline' instead of 'side by side'</li>
<li>[Change] Added new option for merging differences to conflicting files in automatic updater</li>
<li>[Change] Add link to user profile in the MCP for user notes and warn user.</li>
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index e9c74e8e02..07c8944992 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -614,7 +614,7 @@ function create_thumbnail($source, $destination, $mimetype)
list($new_width, $new_height) = get_img_size_format($width, $height);
// Do not create a thumbnail if the resulting width/height is bigger than the original one
- if ($new_width > $width && $new_height > $height)
+ if ($new_width >= $width && $new_height >= $height)
{
return false;
}