diff options
| author |   Marc Alexander <admin@m-a-styles.de> | 2018-11-11 12:22:20 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2018-11-11 12:22:20 +0100 |
| commit | 7801bac09ac1fb5a10c0c518e1e7639233855220 (patch) | |
| tree | ce042bf0f0d978e81a5f9473e2f42845bba6121f /phpBB/install | |
| parent | [3.2.x] Update versions to 3.2.5-dev (diff) | |
| parent | [prep-release-3.2.4] Correctly specify dependencies (diff) | |
| download | phpbb-7801bac09ac1fb5a10c0c518e1e7639233855220.tar.gz phpbb-7801bac09ac1fb5a10c0c518e1e7639233855220.tar.bz2 phpbb-7801bac09ac1fb5a10c0c518e1e7639233855220.zip | |
Merge branch 'prep-release-3.2.4' into 3.2.x
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/convertors/functions_phpbb20.php | 1 | ||||
| -rwxr-xr-x | phpBB/install/phpbbcli.php | 2 | ||||
| -rw-r--r-- | phpBB/install/schemas/schema_data.sql | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php index 8b80eec4c8..2da901d3de 100644 --- a/phpBB/install/convertors/functions_phpbb20.php +++ b/phpBB/install/convertors/functions_phpbb20.php @@ -1694,7 +1694,6 @@ function phpbb_import_attach_config() $config->set('img_create_thumbnail', $attach_config['img_create_thumbnail']); $config->set('img_max_thumb_width', 400); $config->set('img_min_thumb_filesize', $attach_config['img_min_thumb_filesize']); - $config->set('img_imagick', $attach_config['img_imagick']); } /** diff --git a/phpBB/install/phpbbcli.php b/phpBB/install/phpbbcli.php index bc329fd2e5..8911274055 100755 --- a/phpBB/install/phpbbcli.php +++ b/phpBB/install/phpbbcli.php @@ -23,7 +23,7 @@ if (php_sapi_name() !== 'cli') define('IN_PHPBB', true); define('IN_INSTALL', true); define('PHPBB_ENVIRONMENT', 'production'); -define('PHPBB_VERSION', '3.2.4-RC1'); +define('PHPBB_VERSION', '3.2.4'); $phpbb_root_path = __DIR__ . '/../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index e68253e7a2..158c8a1ac7 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -149,7 +149,6 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('hot_threshold', '2 INSERT INTO phpbb_config (config_name, config_value) VALUES ('icons_path', 'images/icons'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_create_thumbnail', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_display_inlined', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_imagick', ''); INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_link_height', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_link_width', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_max_height', '0'); |