From 7e1b6dd9f6d1e90fa1c23d30b5d66a4c9b01c6e4 Mon Sep 17 00:00:00 2001 From: Bohdan Turyk Date: Tue, 22 Sep 2015 17:13:39 +0300 Subject: [PATCH 1/2] Removed deprecated call SafeMarkup::set --- src/Plugin/Field/FieldFormatter/Base.php | 2 +- src/Plugin/Field/FieldWidget/DoubleField.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Plugin/Field/FieldFormatter/Base.php b/src/Plugin/Field/FieldFormatter/Base.php index 4eddbc9..c94d006 100644 --- a/src/Plugin/Field/FieldFormatter/Base.php +++ b/src/Plugin/Field/FieldFormatter/Base.php @@ -97,7 +97,7 @@ public function settingsSummary() { // Summary of general settings. foreach (['first', 'second'] as $subfield) { - $summary[] = SafeMarkup::set('
' . ($subfield == 'first' ? t('First subfield') : t('Second subfield')) . ''); + $summary[] = t('
' . ($subfield == 'first' ? t('First subfield') : t('Second subfield')) . ''); $summary[] = t('Hidden: %value', ['%value' => $settings[$subfield]['hidden'] ? t('yes') : t('no')]); // $format = isset($filter_formats[$settings[$subfield]['format']]) ? $filter_formats[$settings[$subfield]['format']]->name : ''; // $format_color = $settings[$subfield]['format'] == 'full_html' ? 'red' : 'auto'; diff --git a/src/Plugin/Field/FieldWidget/DoubleField.php b/src/Plugin/Field/FieldWidget/DoubleField.php index a05c595..51a50f3 100644 --- a/src/Plugin/Field/FieldWidget/DoubleField.php +++ b/src/Plugin/Field/FieldWidget/DoubleField.php @@ -188,7 +188,7 @@ public function settingsSummary() { } foreach (['first', 'second'] as $subfield) { - $summary[] = SafeMarkup::set('
' . ($subfield == 'first' ? t('First subfield') : t('Second subfield')) . ''); + $summary[] = t('
' . ($subfield == 'first' ? t('First subfield') : t('Second subfield')) . ''); $summary[] = t('Widget: %type', ['%type' => $settings[$subfield]['type']]); switch($settings[$subfield]['type']) { case 'textfield': From 1334f9b1e5df1cfb1b52c437d26dd712021ff0cb Mon Sep 17 00:00:00 2001 From: Bohdan Turyk Date: Tue, 22 Sep 2015 18:09:33 +0300 Subject: [PATCH 2/2] Replaced t() to SafeMarkup::format --- src/Plugin/Field/FieldFormatter/Base.php | 2 +- src/Plugin/Field/FieldWidget/DoubleField.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Plugin/Field/FieldFormatter/Base.php b/src/Plugin/Field/FieldFormatter/Base.php index c94d006..9bda153 100644 --- a/src/Plugin/Field/FieldFormatter/Base.php +++ b/src/Plugin/Field/FieldFormatter/Base.php @@ -97,7 +97,7 @@ public function settingsSummary() { // Summary of general settings. foreach (['first', 'second'] as $subfield) { - $summary[] = t('
' . ($subfield == 'first' ? t('First subfield') : t('Second subfield')) . ''); + $summary[] = SafeMarkup::format('
@subfield', ['@subfield' => ($subfield == 'first' ? t('First subfield') : t('Second subfield'))]); $summary[] = t('Hidden: %value', ['%value' => $settings[$subfield]['hidden'] ? t('yes') : t('no')]); // $format = isset($filter_formats[$settings[$subfield]['format']]) ? $filter_formats[$settings[$subfield]['format']]->name : ''; // $format_color = $settings[$subfield]['format'] == 'full_html' ? 'red' : 'auto'; diff --git a/src/Plugin/Field/FieldWidget/DoubleField.php b/src/Plugin/Field/FieldWidget/DoubleField.php index 51a50f3..2bbbbe7 100644 --- a/src/Plugin/Field/FieldWidget/DoubleField.php +++ b/src/Plugin/Field/FieldWidget/DoubleField.php @@ -188,7 +188,7 @@ public function settingsSummary() { } foreach (['first', 'second'] as $subfield) { - $summary[] = t('
' . ($subfield == 'first' ? t('First subfield') : t('Second subfield')) . ''); + $summary[] = SafeMarkup::format('
@subfield', ['@subfield' => ($subfield == 'first' ? t('First subfield') : t('Second subfield'))]); $summary[] = t('Widget: %type', ['%type' => $settings[$subfield]['type']]); switch($settings[$subfield]['type']) { case 'textfield':