diff options
| author | Wesley Fok <wesley.fok@yp.ca> | 2016-08-03 13:20:42 -0400 |
|---|---|---|
| committer | Wesley Fok <wesley.fok@yp.ca> | 2016-08-03 13:20:42 -0400 |
| commit | ba13832085bf05eb5ab19aeb9681b16c7a119df9 (patch) | |
| tree | 7fb014aeb08e614fe060dfeede0ea05885ff4d7d /phpBB/includes/functions_posting.php | |
| parent | 2081a7809540db661193be376c1220a2c21acff4 (diff) | |
| parent | f68820762b2d78bc26c59724a3dd98091bb3379b (diff) | |
| download | forums-ba13832085bf05eb5ab19aeb9681b16c7a119df9.tar forums-ba13832085bf05eb5ab19aeb9681b16c7a119df9.tar.gz forums-ba13832085bf05eb5ab19aeb9681b16c7a119df9.tar.bz2 forums-ba13832085bf05eb5ab19aeb9681b16c7a119df9.tar.xz forums-ba13832085bf05eb5ab19aeb9681b16c7a119df9.zip | |
Merge remote-tracking branch 'upstream/3.1.x' into ticket/14638-3.1.x
Diffstat (limited to 'phpBB/includes/functions_posting.php')
| -rw-r--r-- | phpBB/includes/functions_posting.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index b2713fef07..57c68d4935 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -702,7 +702,7 @@ function create_thumbnail($source, $destination, $mimetype) $used_imagick = false; - // Only use imagemagick if defined and the passthru function not disabled + // Only use ImageMagick if defined and the passthru function not disabled if ($config['img_imagick'] && function_exists('passthru')) { if (substr($config['img_imagick'], -1) !== '/') |