Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #1411276 by swentel, anrikun, quicksketch: Fixed image.admin.inc: new effect options are double escaped (check_plain()).

8.0.x
Dries 2013-01-16 11:08:56 -05:00
parent 248284df26
commit d2bfb66949
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/modules/image/image.admin.inc
View File

@ -71,7 +71,7 @@ function image_style_form($form, &$form_state, $style) {
foreach ($style->effects as $key => $effect) { foreach ($style->effects as $key => $effect) {
$form['effects'][$key]['#weight'] = isset($form_state['input']['effects']) ? $form_state['input']['effects'][$key]['weight'] : NULL; $form['effects'][$key]['#weight'] = isset($form_state['input']['effects']) ? $form_state['input']['effects'][$key]['weight'] : NULL;
$form['effects'][$key]['label'] = array( $form['effects'][$key]['label'] = array(
'#markup' => $effect['label'], '#markup' => check_plain($effect['label']),
); );
$form['effects'][$key]['summary'] = array( $form['effects'][$key]['summary'] = array(
'#markup' => isset($effect['summary theme']) ? theme($effect['summary theme'], array('data' => $effect['data'])) : '', '#markup' => isset($effect['summary theme']) ? theme($effect['summary theme'], array('data' => $effect['data'])) : '',
@ -115,7 +115,7 @@ function image_style_form($form, &$form_state, $style) {
// Build the new image effect addition form and add it to the effect list. // Build the new image effect addition form and add it to the effect list.
$new_effect_options = array(); $new_effect_options = array();
foreach (image_effect_definitions() as $effect => $definition) { foreach (image_effect_definitions() as $effect => $definition) {
$new_effect_options[$effect] = check_plain($definition['label']); $new_effect_options[$effect] = $definition['label'];
} }
$form['effects']['new'] = array( $form['effects']['new'] = array(
'#tree' => FALSE, '#tree' => FALSE,