diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-07-07 19:19:40 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-07-07 19:19:40 +0200 |
| commit | 45ba2e9770f2f012423bfc2a831771f48357e182 (patch) | |
| tree | e8cff4f796f671f33878a474efb6c1ad3935248a /phpBB/includes | |
| parent | 24b80d6bd7b3cc9d73d1b207b9b4e2c392738293 (diff) | |
| parent | 55b854906d31d60f9f3065910a3d1b1ca6d0b6bf (diff) | |
| download | forums-45ba2e9770f2f012423bfc2a831771f48357e182.tar forums-45ba2e9770f2f012423bfc2a831771f48357e182.tar.gz forums-45ba2e9770f2f012423bfc2a831771f48357e182.tar.bz2 forums-45ba2e9770f2f012423bfc2a831771f48357e182.tar.xz forums-45ba2e9770f2f012423bfc2a831771f48357e182.zip | |
Merge branch '3.1.x' into 3.2.x
Conflicts:
phpBB/install/install_install.php
phpBB/language/en/install.php
Diffstat (limited to 'phpBB/includes')
| -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 2bc7ed471e..48d30a9341 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -544,7 +544,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) !== '/') |