Commit ddee0446 authored by Eileen McNaughton's avatar Eileen McNaughton Committed by GitHub

Merge pull request #15056 from civicrm/5.17

5.17
parents 693fa3b2 40a5085c
......@@ -90,7 +90,7 @@ class CRM_Upgrade_Incremental_php_FiveSeventeen extends CRM_Upgrade_Incremental_
* @param string $rev
*/
public function upgrade_5_17_alpha1($rev) {
$this->addTask(ts('Upgrade DB to %1: SQL', array(1 => $rev)), 'runSql', $rev);
$this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
$this->addTask('Update smart groups where jcalendar fields have been converted to datepicker', 'updateSmartGroups', [
'datepickerConversion' => [
'contribution_recur_start_date',
......@@ -102,6 +102,18 @@ class CRM_Upgrade_Incremental_php_FiveSeventeen extends CRM_Upgrade_Incremental_
'contribution_recur_failure_retry_date',
],
]);
$this->addTask(ts('Add pptx to accepted attachment file types'), 'updateFileTypes');
}
/**
* Update safe file types.
*/
public function updateFileTypes() {
CRM_Core_BAO_OptionValue::ensureOptionValueExists([
'safe_file_extension',
['label' => 'pptx', 'name' => 'pptx'],
]);
return TRUE;
}
}
This diff is collapsed.
......@@ -677,6 +677,7 @@ VALUES
(@option_group_id_sfe, 'xlsx', 13, 'xlsx', NULL, 0, 0, 13, NULL, 0, 0, 1, NULL, NULL, NULL),
(@option_group_id_sfe, 'odt', 14, 'odt', NULL, 0, 0, 14, NULL, 0, 0, 1, NULL, NULL, NULL),
(@option_group_id_sfe, 'ics', 15, 'ics', NULL, 0, 0, 15, NULL, 0, 0, 1, NULL, NULL, NULL),
(@option_group_id_sfe, 'pptx', 16, 'pptx', NULL, 0, 0, 16, NULL, 0, 0, 1, NULL, NULL, NULL),
(@option_group_id_we, '{ts escape="sql"}Textarea{/ts}', 1, 'Textarea', NULL, 0, NULL, 1, NULL, 0, 1, 1, NULL, NULL, NULL),
(@option_group_id_we, 'CKEditor', 2, 'CKEditor', NULL, 0, NULL, 2, NULL, 0, 1, 1, NULL, NULL, NULL),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment