diff --git a/include/class.config.php b/include/class.config.php index 7d3aad655565903b1c68586a13c010f033d831e6..5d0c8160fda9113de06af83bcf58482d0ad996e8 100644 --- a/include/class.config.php +++ b/include/class.config.php @@ -142,6 +142,10 @@ class OsticketConfig extends Config { 'allow_pw_reset' => true, 'pw_reset_window' => 30, 'enable_html_thread' => true, + 'allow_attachments' => true, + 'allow_email_attachments' => true, + 'allow_online_attachments' => true, + 'allow_online_attachments_onlogin' => false, ); function OsticketConfig($section=null) { diff --git a/include/upgrader/streams/core.sig b/include/upgrader/streams/core.sig index ecec52efd887fe2457ad1103917e23f88d59f9ef..8ced61f0cdd122a0aaeead6269f21f5ee31c8d88 100644 --- a/include/upgrader/streams/core.sig +++ b/include/upgrader/streams/core.sig @@ -1 +1 @@ -ec19794f1fc8d6a54ac217d6e8006a85 +dad45ca24a3800102f8b92c7279347db diff --git a/include/upgrader/streams/core/d51f303a-ec19794f.patch.sql b/include/upgrader/streams/core/d51f303a-dad45ca2.patch.sql similarity index 97% rename from include/upgrader/streams/core/d51f303a-ec19794f.patch.sql rename to include/upgrader/streams/core/d51f303a-dad45ca2.patch.sql index 8a21a8b781da5d649a411959071ff608c1720719..6f2727600eed75fcf85c3e7c0bc844470c842738 100644 --- a/include/upgrader/streams/core/d51f303a-ec19794f.patch.sql +++ b/include/upgrader/streams/core/d51f303a-dad45ca2.patch.sql @@ -1,5 +1,5 @@ /** - * @signature ec19794f1fc8d6a54ac217d6e8006a85 + * @signature dad45ca24a3800102f8b92c7279347db * @version 1.8.0 - HTML ticket thread * * Migrate to a single attachment table to allow for inline image support @@ -134,5 +134,5 @@ UPDATE `%TABLE_PREFIX%ticket_thread` -- Finished with patch UPDATE `%TABLE_PREFIX%config` - SET `value` = 'ec19794f1fc8d6a54ac217d6e8006a85' + SET `value` = 'dad45ca24a3800102f8b92c7279347db' WHERE `key` = 'schema_signature' AND `namespace` = 'core'; diff --git a/include/upgrader/streams/core/d51f303a-ec19794f.task.php b/include/upgrader/streams/core/d51f303a-dad45ca2.task.php similarity index 100% rename from include/upgrader/streams/core/d51f303a-ec19794f.task.php rename to include/upgrader/streams/core/d51f303a-dad45ca2.task.php diff --git a/setup/inc/streams/core/install-mysql.sql b/setup/inc/streams/core/install-mysql.sql index 6841080644432453870cf42922339b95c660c27f..4891bcb0f9023b7cf97a1facd84b7bd19e54cc7c 100644 --- a/setup/inc/streams/core/install-mysql.sql +++ b/setup/inc/streams/core/install-mysql.sql @@ -162,10 +162,6 @@ INSERT INTO `%TABLE_PREFIX%config` (`namespace`, `key`, `value`) VALUES ('core', 'hide_staff_name', '0'), ('core', 'overlimit_notice_active', '0'), ('core', 'email_attachments', '1'), - ('core', 'allow_attachments', '0'), - ('core', 'allow_email_attachments', '0'), - ('core', 'allow_online_attachments', '0'), - ('core', 'allow_online_attachments_onlogin', '0'), ('core', 'random_ticket_ids', '1'), ('core', 'log_level', '2'), ('core', 'log_graceperiod', '12'),