diff options
| author | Anika Henke <anika@selfthinker.org> | 2014-02-02 14:43:06 +0000 |
|---|---|---|
| committer | Anika Henke <anika@selfthinker.org> | 2014-02-02 14:43:06 +0000 |
| commit | a051c2744a397f5ccbb688e0edab307451dc522d (patch) | |
| tree | d9744944e50f2c23df22bd6856779bd228e129c4 /inc/media.php | |
| parent | 3641199a253e8f92f378f03926af80724ef04146 (diff) | |
| parent | a8895ef5de970d5e6b1e273c3fe111b606611244 (diff) | |
| download | rpg-a051c2744a397f5ccbb688e0edab307451dc522d.tar.gz rpg-a051c2744a397f5ccbb688e0edab307451dc522d.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into video-audio
Diffstat (limited to 'inc/media.php')
| -rw-r--r-- | inc/media.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/inc/media.php b/inc/media.php index 2943e8274..960b96e65 100644 --- a/inc/media.php +++ b/inc/media.php @@ -1804,6 +1804,7 @@ function media_resize_image($file, $ext, $w, $h=0){ if($info == false) return $file; // that's no image - it's a spaceship! if(!$h) $h = round(($w * $info[1]) / $info[0]); + if(!$w) $w = round(($h * $info[0]) / $info[1]); // we wont scale up to infinity if($w > 2000 || $h > 2000) return $file; |