diff options
| author | Dhruv <dhruv.goel92@gmail.com> | 2015-04-14 09:10:47 +0530 |
|---|---|---|
| committer | Dhruv <dhruv.goel92@gmail.com> | 2015-04-14 09:10:47 +0530 |
| commit | 2c0b1252c8ee7f9c40f15587aa00aa2e70a7168f (patch) | |
| tree | fe3219d74caa7d8afa1f28c05551c76bc00cac9f /phpBB/phpbb | |
| parent | bf107ba1af0f40471c1eecb86ce2e0cfae332ac1 (diff) | |
| parent | ba1e3fd66173ccecf29f8dfef761772322182ff0 (diff) | |
| download | forums-2c0b1252c8ee7f9c40f15587aa00aa2e70a7168f.tar forums-2c0b1252c8ee7f9c40f15587aa00aa2e70a7168f.tar.gz forums-2c0b1252c8ee7f9c40f15587aa00aa2e70a7168f.tar.bz2 forums-2c0b1252c8ee7f9c40f15587aa00aa2e70a7168f.tar.xz forums-2c0b1252c8ee7f9c40f15587aa00aa2e70a7168f.zip | |
Merge branch '3.1.x'
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/plupload/plupload.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/phpbb/plupload/plupload.php b/phpBB/phpbb/plupload/plupload.php index fcce5b3bd8..ca78167ec0 100644 --- a/phpBB/phpbb/plupload/plupload.php +++ b/phpBB/phpbb/plupload/plupload.php @@ -267,8 +267,8 @@ class plupload { $resize = sprintf( 'resize: {width: %d, height: %d, quality: 100},', - (int) $this->config['img_max_height'], - (int) $this->config['img_max_width'] + (int) $this->config['img_max_width'], + (int) $this->config['img_max_height'] ); } |