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 | |
| 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')
| -rw-r--r-- | phpBB/docs/INSTALL.html | 2 | ||||
| -rw-r--r-- | phpBB/includes/functions_posting.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/acp/attachments.php | 4 | ||||
| -rw-r--r-- | phpBB/phpbb/install/module/obtain_data/task/obtain_imagick_path.php | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/docs/INSTALL.html b/phpBB/docs/INSTALL.html index 62af05c735..5bae9a0580 100644 --- a/phpBB/docs/INSTALL.html +++ b/phpBB/docs/INSTALL.html @@ -160,7 +160,7 @@ <li>zlib Compression support</li> <li>Remote FTP support</li> <li>XML support</li> - <li>Imagemagick support</li> + <li>ImageMagick support</li> <li>GD Support</li> </ul> </li> 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) !== '/') diff --git a/phpBB/language/en/acp/attachments.php b/phpBB/language/en/acp/attachments.php index 5ff904f9fc..20264536ff 100644 --- a/phpBB/language/en/acp/attachments.php +++ b/phpBB/language/en/acp/attachments.php @@ -111,7 +111,7 @@ $lang = array_merge($lang, array( 'IMAGE_LINK_SIZE' => 'Image link dimensions', 'IMAGE_LINK_SIZE_EXPLAIN' => 'Display image attachment as an inline text link if image is larger than this. To disable this behaviour, set the values to 0px by 0px.', - 'IMAGICK_PATH' => 'Imagemagick path', + 'IMAGICK_PATH' => 'ImageMagick path', 'IMAGICK_PATH_EXPLAIN' => 'Full path to the imagemagick convert application, e.g. <samp>/usr/bin/</samp>.', 'MAX_ATTACHMENTS' => 'Maximum number of attachments per post', @@ -147,7 +147,7 @@ $lang = array_merge($lang, array( 'REMOVE_DISALLOWED_IPS' => 'Remove or un-exclude <em>disallowed</em> IPs/hostnames', 'RESYNC_FILES_STATS_CONFIRM' => 'Are you sure you wish to resynchronise file statistics?', - 'SEARCH_IMAGICK' => 'Search for Imagemagick', + 'SEARCH_IMAGICK' => 'Search for ImageMagick', 'SECURE_ALLOW_DENY' => 'Allow/Deny list', 'SECURE_ALLOW_DENY_EXPLAIN' => 'Change the default behaviour when secure downloads are enabled of the Allow/Deny list to that of a <strong>whitelist</strong> (Allow) or a <strong>blacklist</strong> (Deny).', 'SECURE_DOWNLOADS' => 'Enable secure downloads', diff --git a/phpBB/phpbb/install/module/obtain_data/task/obtain_imagick_path.php b/phpBB/phpbb/install/module/obtain_data/task/obtain_imagick_path.php index 9f74b61770..377d96ed1a 100644 --- a/phpBB/phpbb/install/module/obtain_data/task/obtain_imagick_path.php +++ b/phpBB/phpbb/install/module/obtain_data/task/obtain_imagick_path.php @@ -37,7 +37,7 @@ class obtain_imagick_path extends \phpbb\install\task_base implements \phpbb\ins */ public function run() { - // Can we find Imagemagick anywhere on the system? + // Can we find ImageMagick anywhere on the system? $exe = (DIRECTORY_SEPARATOR == '\\') ? '.exe' : ''; $magic_home = getenv('MAGICK_HOME'); |