mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.1.x' into 3.2.x

Browse Source 
Conflicts:
	phpBB/install/install_install.php
	phpBB/language/en/install.php
This commit is contained in:
Marc Alexander
2016-07-07 19:19:40 +02:00
parent 24b80d6bd7 55b854906d
commit 45ba2e9770
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/phpbb/install/module/obtain_data/task/obtain_imagick_path.php
View File

@@ -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');