aboutsummaryrefslogtreecommitdiff
path: root/phpBB
diff options
context:
space:
mode:
authorKYPREO <58344533+KYPREO@users.noreply.github.com>2020-01-28 23:57:31 +1100
committerKYPREO <58344533+KYPREO@users.noreply.github.com>2020-01-28 23:57:31 +1100
commitc927c31391de940f0f2520f190dc7a39e2ad1b14 (patch)
tree543f9f7b9fef3e8a3ce52ae736fa65d6e0e63fcb /phpBB
parentMerge branch '3.2.x' into ticket/16329 (diff)
downloadphpbb-c927c31391de940f0f2520f190dc7a39e2ad1b14.tar.gz
phpbb-c927c31391de940f0f2520f190dc7a39e2ad1b14.tar.bz2
phpbb-c927c31391de940f0f2520f190dc7a39e2ad1b14.zip
[ticket/16329] Add configuration options for Plupload
PHPBB3-16329 PHPBB3-16330
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/install/schemas/schema_data.sql2
-rw-r--r--phpBB/language/en/acp/attachments.php4
-rw-r--r--phpBB/phpbb/db/migration/data/v32x/add_plupload_config.php (renamed from phpBB/phpbb/db/migration/data/v32x/enable_plupload_config.php)6
3 files changed, 6 insertions, 6 deletions
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index d20e00a53d..52c6061eb4 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -156,7 +156,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_max_thumb_widt
INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_max_width', '0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_min_thumb_filesize', '12000');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_quality', '85');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_strip_metadata', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_strip_metadata', '0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('ip_check', '3');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('ip_login_limit_max', '50');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('ip_login_limit_time', '21600');
diff --git a/phpBB/language/en/acp/attachments.php b/phpBB/language/en/acp/attachments.php
index 1e67a0c3fb..d4768cae07 100644
--- a/phpBB/language/en/acp/attachments.php
+++ b/phpBB/language/en/acp/attachments.php
@@ -112,9 +112,9 @@ $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.',
'IMAGE_QUALITY' => 'Quality of uploaded image attachments (JPEG only)',
- 'IMAGE_QUALITY_EXPLAIN' => 'Specify value between 50% (smaller file size) and 90% (higher quality). Quality higher than 90% increases filesize and is disabled. Setting only applies if max image dimensions set to value other than 0px by 0px.',
+ 'IMAGE_QUALITY_EXPLAIN' => 'Specify value between 50% (smaller file size) and 90% (higher quality). Quality higher than 90% increases filesize and is disabled. Setting only applies if maximum image dimensions are set to a value other than 0px by 0px.',
'IMAGE_STRIP_METADATA' => 'Strip image metadata (JPEG only)',
- 'IMAGE_STRIP_METADATA_EXPLAIN' => 'Strip Exif metadata eg author name, GPS coordinates & camera details. Setting only applies if max image dimensions set to value other than 0px by 0px.',
+ 'IMAGE_STRIP_METADATA_EXPLAIN' => 'Strip Exif metadata, e.g. author name, GPS coordinates and camera details. Setting only applies if maximum image dimensions are set to a value other than 0px by 0px.',
'MAX_ATTACHMENTS' => 'Maximum number of attachments per post',
'MAX_ATTACHMENTS_PM' => 'Maximum number of attachments per private message',
diff --git a/phpBB/phpbb/db/migration/data/v32x/enable_plupload_config.php b/phpBB/phpbb/db/migration/data/v32x/add_plupload_config.php
index a2f6af53db..d708155807 100644
--- a/phpBB/phpbb/db/migration/data/v32x/enable_plupload_config.php
+++ b/phpBB/phpbb/db/migration/data/v32x/add_plupload_config.php
@@ -13,18 +13,18 @@
namespace phpbb\db\migration\data\v32x;
-class enable_plupload_config extends \phpbb\db\migration\migration
+class add_plupload_config extends \phpbb\db\migration\migration
{
static public function depends_on()
{
- return ['\phpbb\db\migration\data\v32x\v329',];
+ return ['\phpbb\db\migration\data\v32x\v329'];
}
public function update_data()
{
return [
['config.add', ['img_quality', '85']],
- ['config.add', ['img_strip_metadata', '1']],
+ ['config.add', ['img_strip_metadata', '0']],
];
}
}