diff --git a/core/modules/editor/editor.module b/core/modules/editor/editor.module index c4fea8e..ede4337 100644 --- a/core/modules/editor/editor.module +++ b/core/modules/editor/editor.module @@ -207,10 +207,10 @@ function editor_form_filter_format_form_alter(&$form, &$form_state) { $settings_form['#element_validate'][] = array($plugin, 'settingsFormValidate'); $form['editor']['settings']['subform'] = $plugin->settingsForm($settings_form, $form_state, $editor); $form['editor']['settings']['subform']['#parents'] = array('editor', 'settings'); - $form['#submit'][] = array($plugin, 'settingsFormSubmit'); + $form['actions']['submit']['#submit'][] = array($plugin, 'settingsFormSubmit'); } - $form['#submit'][] = 'editor_form_filter_admin_format_submit'; + $form['actions']['submit']['#submit'][] = 'editor_form_filter_admin_format_submit'; } /** @@ -255,7 +255,7 @@ function editor_form_filter_admin_format_submit($form, &$form_state) { if ($form_state['values']['editor']['editor'] !== '') { // Ensure the text format is set: when creating a new text format, this // would equal the empty string. - $form_state['editor']->format = $form_state['controller']->getEntity()->id(); + $form_state['editor']->format = $format_id; $form_state['editor']->settings = $form_state['values']['editor']['settings']; $form_state['editor']->save(); } diff --git a/core/modules/filter/lib/Drupal/filter/FilterFormatFormControllerBase.php b/core/modules/filter/lib/Drupal/filter/FilterFormatFormControllerBase.php index 6574f73..cfb0aee 100644 --- a/core/modules/filter/lib/Drupal/filter/FilterFormatFormControllerBase.php +++ b/core/modules/filter/lib/Drupal/filter/FilterFormatFormControllerBase.php @@ -200,6 +200,7 @@ public function submit(array $form, array &$form_state) { protected function actions(array $form, array &$form_state) { $actions = parent::actions($form, $form_state); $actions['submit']['#value'] = t('Save configuration'); + unset($actions['delete']); return $actions; }