diff --git a/core/core.services.yml b/core/core.services.yml
index 5b0de75..5c42b23 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -93,11 +93,6 @@ services:
arguments: ['@request_stack']
tags:
- { name: cache.context }
- cache_context.url.path.is_front:
- class: Drupal\Core\Cache\Context\IsFrontPathCacheContext
- arguments: ['@path.matcher']
- tags:
- - { name: cache.context }
cache_context.url.query_args:
class: Drupal\Core\Cache\Context\QueryArgsCacheContext
arguments: ['@request_stack']
diff --git a/core/includes/batch.inc b/core/includes/batch.inc
index f84c01b..01133ba 100644
--- a/core/includes/batch.inc
+++ b/core/includes/batch.inc
@@ -123,7 +123,7 @@ function _batch_progress_page() {
// function), it will output whatever is in the output buffer, followed by
// the error message.
ob_start();
- $fallback = $current_set['error_message'] . ' ' . $batch['error_message'];
+ $fallback = $current_set['error_message'] . ' ' . $batch['error_message'];
// We strip the end of the page using a marker in the template, so any
// additional HTML output by PHP shows up inside the page rather than below
@@ -182,7 +182,7 @@ function _batch_progress_page() {
// Adds JavaScript code and settings for clients where JavaScript is enabled.
'drupalSettings' => [
'batch' => [
- 'errorMessage' => $current_set['error_message'] . ' ' . $batch['error_message'],
+ 'errorMessage' => $current_set['error_message'] . ' ' . $batch['error_message'],
'initMessage' => $current_set['init_message'],
'uri' => $url,
],
diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc
index f74859e..18adb58 100644
--- a/core/includes/bootstrap.inc
+++ b/core/includes/bootstrap.inc
@@ -594,7 +594,7 @@ function _drupal_exception_handler_additional($exception, $exception2) {
if (error_displayable()) {
print '
Additional uncaught exception thrown while handling exception.
';
print '
Original
' . Error::renderExceptionSafe($exception) . '
';
- print '
Additional
' . Error::renderExceptionSafe($exception2) . '
';
+ print '
Additional
' . Error::renderExceptionSafe($exception2) . '
';
}
}
@@ -1018,7 +1018,7 @@ function _drupal_shutdown_function_handle_exception($exception) {
require_once __DIR__ . '/errors.inc';
if (error_displayable()) {
print '
Uncaught exception thrown in shutdown function.
';
- print '
' . Error::renderExceptionSafe($exception) . '
';
+ print '
' . Error::renderExceptionSafe($exception) . '
';
}
}
error_log($exception);
diff --git a/core/includes/errors.inc b/core/includes/errors.inc
index e3ad1c8..cefe847 100644
--- a/core/includes/errors.inc
+++ b/core/includes/errors.inc
@@ -253,7 +253,7 @@ function _drupal_log_error($error, $fatal = FALSE) {
// We fallback to a maintenance page at this point, because the page generation
// itself can generate errors.
// Should not translate the string to avoid errors producing more errors.
- $message = 'The website encountered an unexpected error. Please try again later.' . ' ' . $message;
+ $message = 'The website encountered an unexpected error. Please try again later.' . ' ' . $message;
if ($is_installer) {
// install_display_output() prints the output and ends script execution.
diff --git a/core/includes/form.inc b/core/includes/form.inc
index b4c6a71..8964dfc 100644
--- a/core/includes/form.inc
+++ b/core/includes/form.inc
@@ -741,7 +741,7 @@ function batch_set($batch_definition) {
// Tweak init_message to avoid the bottom of the page flickering down after
// init phase.
- $batch_set['init_message'] .= ' ';
+ $batch_set['init_message'] .= ' ';
// The non-concurrent workflow of batch execution allows us to save
// numberOfItems() queries by handling our own counter.
diff --git a/core/lib/Drupal/Component/PhpStorage/MTimeProtectedFastFileStorage.php b/core/lib/Drupal/Component/PhpStorage/MTimeProtectedFastFileStorage.php
index c7e6feb..3c5d55d 100644
--- a/core/lib/Drupal/Component/PhpStorage/MTimeProtectedFastFileStorage.php
+++ b/core/lib/Drupal/Component/PhpStorage/MTimeProtectedFastFileStorage.php
@@ -2,8 +2,6 @@
namespace Drupal\Component\PhpStorage;
-use Drupal\Component\Utility\Crypt;
-
/**
* Stores PHP code in files with securely hashed names.
*
@@ -132,7 +130,7 @@ public function getFullPath($name, &$directory = NULL, &$directory_mtime = NULL)
if (!isset($directory_mtime)) {
$directory_mtime = file_exists($directory) ? filemtime($directory) : 0;
}
- return $directory . '/' . Crypt::hmacBase64($name, $this->secret . $directory_mtime) . '.php';
+ return $directory . '/' . hash_hmac('sha256', $name, $this->secret . $directory_mtime) . '.php';
}
/**
@@ -227,7 +225,7 @@ protected function getUncachedMTime($directory) {
*/
protected function tempnam($directory, $prefix) {
do {
- $path = $directory . '/' . $prefix . Crypt::randomBytesBase64(20);
+ $path = $directory . '/' . $prefix . substr(str_shuffle(hash('sha256', microtime())), 0, 10);
} while (file_exists($path));
return $path;
}
diff --git a/core/lib/Drupal/Component/Utility/Html.php b/core/lib/Drupal/Component/Utility/Html.php
index 5456cfa..e262a08 100644
--- a/core/lib/Drupal/Component/Utility/Html.php
+++ b/core/lib/Drupal/Component/Utility/Html.php
@@ -272,7 +272,7 @@ public static function load($html) {
$document = <<
-
+
!html
EOD;
diff --git a/core/lib/Drupal/Core/Cache/Context/IsFrontPathCacheContext.php b/core/lib/Drupal/Core/Cache/Context/IsFrontPathCacheContext.php
deleted file mode 100644
index 141b13a..0000000
--- a/core/lib/Drupal/Core/Cache/Context/IsFrontPathCacheContext.php
+++ /dev/null
@@ -1,52 +0,0 @@
-pathMatcher = $path_matcher;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function getLabel() {
- return t('Is front page');
- }
-
- /**
- * {@inheritdoc}
- */
- public function getContext() {
- return 'is_front.' . (int) $this->pathMatcher->isFrontPage();
- }
-
- /**
- * {@inheritdoc}
- */
- public function getCacheableMetadata() {
- $metadata = new CacheableMetadata();
- $metadata->addCacheTags(['config:system.site']);
- return $metadata;
- }
-
-}
diff --git a/core/lib/Drupal/Core/Entity/ContentEntityStorageBase.php b/core/lib/Drupal/Core/Entity/ContentEntityStorageBase.php
index c25fd48..afdce40 100644
--- a/core/lib/Drupal/Core/Entity/ContentEntityStorageBase.php
+++ b/core/lib/Drupal/Core/Entity/ContentEntityStorageBase.php
@@ -627,46 +627,6 @@ protected function setPersistentCache($entities) {
/**
* {@inheritdoc}
*/
- public function loadUnchanged($id) {
- $ids = [$id];
-
- // The cache invalidation in the parent has the side effect that loading the
- // same entity again during the save process (for example in
- // hook_entity_presave()) will load the unchanged entity. Simulate this
- // by explicitly removing the entity from the static cache.
- parent::resetCache($ids);
-
- // The default implementation in the parent class unsets the current cache
- // and then reloads the entity. That is slow, especially if this is done
- // repeatedly in the same request, e.g. when validating and then saving
- // an entity. Optimize this for content entities by trying to load them
- // directly from the persistent cache again, as in contrast to the static
- // cache the persistent one will never be changed until the entity is saved.
- $entities = $this->getFromPersistentCache($ids);
-
- if (!$entities) {
- $entities[$id] = $this->load($id);
- }
- else {
- // As the entities are put into the persistent cache before the post load
- // has been executed we have to execute it if we have retrieved the
- // entity directly from the persistent cache.
- $this->postLoad($entities);
-
- if ($this->entityType->isStaticallyCacheable()) {
- // As we've removed the entity from the static cache already we have to
- // put the loaded unchanged entity there to simulate the behavior of the
- // parent.
- $this->setStaticCache($entities);
- }
- }
-
- return $entities[$id];
- }
-
- /**
- * {@inheritdoc}
- */
public function resetCache(array $ids = NULL) {
if ($ids) {
$cids = array();
diff --git a/core/lib/Drupal/Core/EventSubscriber/ActiveLinkResponseFilter.php b/core/lib/Drupal/Core/EventSubscriber/ActiveLinkResponseFilter.php
index 2f965e1..8a48509 100644
--- a/core/lib/Drupal/Core/EventSubscriber/ActiveLinkResponseFilter.php
+++ b/core/lib/Drupal/Core/EventSubscriber/ActiveLinkResponseFilter.php
@@ -176,7 +176,7 @@ public static function setLinkActiveClass($html_markup, $current_path, $is_front
// Parse it into a DOMDocument so we can reliably read and modify
// attributes.
$dom = new \DOMDocument();
- @$dom->loadHTML('' . $tag . '');
+ @$dom->loadHTML('' . $tag . '');
$node = $dom->getElementsByTagName('body')->item(0)->firstChild;
// Ensure we don't set the "active" class twice on the same element.
diff --git a/core/lib/Drupal/Core/FileTransfer/Form/FileTransferAuthorizeForm.php b/core/lib/Drupal/Core/FileTransfer/Form/FileTransferAuthorizeForm.php
index 647463a..412e331 100644
--- a/core/lib/Drupal/Core/FileTransfer/Form/FileTransferAuthorizeForm.php
+++ b/core/lib/Drupal/Core/FileTransfer/Form/FileTransferAuthorizeForm.php
@@ -91,7 +91,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
* leads to the actual operation).
*/
$form['submit_connection'] = array(
- '#prefix' => " ",
+ '#prefix' => " ",
'#name' => 'enter_connection_settings',
'#type' => 'submit',
'#value' => $this->t('Enter connection settings'),
diff --git a/core/lib/Drupal/Core/Render/Element/HtmlTag.php b/core/lib/Drupal/Core/Render/Element/HtmlTag.php
index 1d71350..0e2c2d0 100644
--- a/core/lib/Drupal/Core/Render/Element/HtmlTag.php
+++ b/core/lib/Drupal/Core/Render/Element/HtmlTag.php
@@ -87,7 +87,7 @@ public static function preRenderHtmlTag($element) {
$markup = '<' . $escaped_tag . $attributes;
// Construct a void element.
if (in_array($element['#tag'], self::$voidElements)) {
- $markup .= " />\n";
+ $markup .= ">\n";
}
// Construct all other elements.
else {
diff --git a/core/lib/Drupal/Core/Session/SessionHandler.php b/core/lib/Drupal/Core/Session/SessionHandler.php
index 50bb22f..ce4245e 100644
--- a/core/lib/Drupal/Core/Session/SessionHandler.php
+++ b/core/lib/Drupal/Core/Session/SessionHandler.php
@@ -90,7 +90,7 @@ public function write($sid, $value) {
// further uncaught exception being thrown.
if (error_displayable()) {
print '
' . "\n \n";
}
diff --git a/core/modules/big_pipe/src/Tests/BigPipeTest.php b/core/modules/big_pipe/src/Tests/BigPipeTest.php
index a3f773e..af72756 100644
--- a/core/modules/big_pipe/src/Tests/BigPipeTest.php
+++ b/core/modules/big_pipe/src/Tests/BigPipeTest.php
@@ -86,7 +86,7 @@ public function testNoJsDetection() {
$this->drupalLogin($this->rootUser);
$this->assertSessionCookieExists(TRUE);
$this->assertBigPipeNoJsCookieExists(FALSE);
- $this->assertRaw('');
+ $this->assertRaw('');
$this->assertNoRaw($no_js_to_js_markup);
$this->assertBigPipeNoJsMetaRefreshRedirect();
$this->assertBigPipeNoJsCookieExists(TRUE);
@@ -104,7 +104,7 @@ public function testNoJsDetection() {
$this->drupalGet(Url::fromRoute('user.login'));
$this->assertSessionCookieExists(TRUE);
$this->assertBigPipeNoJsCookieExists(FALSE);
- $this->assertRaw('');
+ $this->assertRaw('');
$this->assertNoRaw($no_js_to_js_markup);
$this->assertBigPipeNoJsMetaRefreshRedirect();
$this->assertBigPipeNoJsCookieExists(TRUE);
diff --git a/core/modules/book/templates/book-export-html.html.twig b/core/modules/book/templates/book-export-html.html.twig
index 5fb2e97..52bc9f2 100644
--- a/core/modules/book/templates/book-export-html.html.twig
+++ b/core/modules/book/templates/book-export-html.html.twig
@@ -23,8 +23,8 @@
{{ title }}
{{ page.head }}
-
-
+
+
{#
diff --git a/core/modules/ckeditor/js/ckeditor.drupalimage.admin.js b/core/modules/ckeditor/js/ckeditor.drupalimage.admin.js
index 256bb41..4b9d61e 100644
--- a/core/modules/ckeditor/js/ckeditor.drupalimage.admin.js
+++ b/core/modules/ckeditor/js/ckeditor.drupalimage.admin.js
@@ -35,7 +35,7 @@
var output = '';
output += Drupal.t('Uploads enabled, max size: @size @dimensions', {'@size': maxFileSize, '@dimensions': maxDimensions});
if ($scheme.length) {
- output += ' ' + $scheme.attr('data-label');
+ output += ' ' + $scheme.attr('data-label');
}
return output;
});
diff --git a/core/modules/ckeditor/src/Plugin/CKEditorPlugin/StylesCombo.php b/core/modules/ckeditor/src/Plugin/CKEditorPlugin/StylesCombo.php
index 9c4f224..a290a96 100644
--- a/core/modules/ckeditor/src/Plugin/CKEditorPlugin/StylesCombo.php
+++ b/core/modules/ckeditor/src/Plugin/CKEditorPlugin/StylesCombo.php
@@ -80,7 +80,7 @@ public function settingsForm(array $form, FormStateInterface $form_state, Editor
'#title_display' => 'invisible',
'#type' => 'textarea',
'#default_value' => $config['styles'],
- '#description' => $this->t('A list of classes that will be provided in the "Styles" dropdown. Enter one or more classes on each line in the format: element.classA.classB|Label. Example: h1.title|Title. Advanced example: h1.fancy.title|Fancy title. These styles should be available in your theme\'s CSS file.'),
+ '#description' => $this->t('A list of classes that will be provided in the "Styles" dropdown. Enter one or more classes on each line in the format: element.classA.classB|Label. Example: h1.title|Title. Advanced example: h1.fancy.title|Fancy title. These styles should be available in your theme\'s CSS file.'),
'#attached' => array(
'library' => array('ckeditor/drupal.ckeditor.stylescombo.admin'),
),
diff --git a/core/modules/comment/src/Tests/CommentInterfaceTest.php b/core/modules/comment/src/Tests/CommentInterfaceTest.php
index ba43224..869c4ef 100644
--- a/core/modules/comment/src/Tests/CommentInterfaceTest.php
+++ b/core/modules/comment/src/Tests/CommentInterfaceTest.php
@@ -277,7 +277,7 @@ public function testAutoFilledHtmlSubject() {
$this->drupalGet('node/' . $this->node->id());
// HTML should not be included in the character count.
- $body_text1 = 'Hello World ';
+ $body_text1 = 'Hello World ';
$edit1 = array(
'comment_body[0][value]' => $body_text1,
'comment_body[0][format]' => 'filtered_html',
@@ -286,7 +286,7 @@ public function testAutoFilledHtmlSubject() {
$this->assertEqual('Hello World', Comment::load(1)->getSubject());
// If there's nothing other than HTML, the subject should be '(No subject)'.
- $body_text2 = ' ';
+ $body_text2 = ' ';
$edit2 = array(
'comment_body[0][value]' => $body_text2,
'comment_body[0][format]' => 'filtered_html',
diff --git a/core/modules/content_translation/content_translation.module b/core/modules/content_translation/content_translation.module
index 70413d9..8d4864a 100644
--- a/core/modules/content_translation/content_translation.module
+++ b/core/modules/content_translation/content_translation.module
@@ -42,7 +42,7 @@ function content_translation_help($route_name, RouteMatchInterface $route_match)
case 'language.content_settings_page':
$output = '';
if (!\Drupal::languageManager()->isMultilingual()) {
- $output .= ' ' . t('Before you can translate content, there must be at least two languages added on the languages administration page.', array(':url' => \Drupal::url('entity.configurable_language.collection')));
+ $output .= ' ' . t('Before you can translate content, there must be at least two languages added on the languages administration page.', array(':url' => \Drupal::url('entity.configurable_language.collection')));
}
return $output;
}
diff --git a/core/modules/editor/src/Form/EditorImageDialog.php b/core/modules/editor/src/Form/EditorImageDialog.php
index 6f18546..c3d34da 100644
--- a/core/modules/editor/src/Form/EditorImageDialog.php
+++ b/core/modules/editor/src/Form/EditorImageDialog.php
@@ -142,7 +142,7 @@ public function buildForm(array $form, FormStateInterface $form_state, Editor $e
'#placeholder' => $this->t('Short description for the visually impaired'),
'#type' => 'textfield',
'#required' => TRUE,
- '#required_error' => $this->t('Alternative text is required. (Only in rare cases should this be left empty. To create empty alternative text, enter "" — two double quotes without any content).'),
+ '#required_error' => $this->t('Alternative text is required. (Only in rare cases should this be left empty. To create empty alternative text, enter "" — two double quotes without any content).'),
'#default_value' => $alt,
'#maxlength' => 2048,
);
diff --git a/core/modules/field_ui/src/Form/EntityDisplayFormBase.php b/core/modules/field_ui/src/Form/EntityDisplayFormBase.php
index 8908f65..037a6ff 100644
--- a/core/modules/field_ui/src/Form/EntityDisplayFormBase.php
+++ b/core/modules/field_ui/src/Form/EntityDisplayFormBase.php
@@ -413,7 +413,7 @@ protected function buildFieldRow(FieldDefinitionInterface $field_definition, arr
if (!empty($summary)) {
$field_row['settings_summary'] = array(
'#type' => 'inline_template',
- '#template' => '
{{ summary|safe_join(" ") }}
',
+ '#template' => '
{{ summary|safe_join(" ") }}
',
'#context' => array('summary' => $summary),
'#cell_attributes' => array('class' => array('field-plugin-summary-cell')),
);
diff --git a/core/modules/field_ui/src/Form/FieldConfigEditForm.php b/core/modules/field_ui/src/Form/FieldConfigEditForm.php
index ff6d157..9a20f76 100644
--- a/core/modules/field_ui/src/Form/FieldConfigEditForm.php
+++ b/core/modules/field_ui/src/Form/FieldConfigEditForm.php
@@ -60,7 +60,7 @@ public function form(array $form, FormStateInterface $form_state) {
'#title' => $this->t('Help text'),
'#default_value' => $this->entity->getDescription(),
'#rows' => 5,
- '#description' => $this->t('Instructions to present to the user below this field on the editing form. Allowed HTML tags: @tags', array('@tags' => FieldFilteredMarkup::displayAllowedTags())) . ' ' . $this->t('This field supports tokens.'),
+ '#description' => $this->t('Instructions to present to the user below this field on the editing form. Allowed HTML tags: @tags', array('@tags' => FieldFilteredMarkup::displayAllowedTags())) . ' ' . $this->t('This field supports tokens.'),
'#weight' => -10,
);
diff --git a/core/modules/field_ui/src/Tests/ManageDisplayTest.php b/core/modules/field_ui/src/Tests/ManageDisplayTest.php
index 902a193..6c8c574 100644
--- a/core/modules/field_ui/src/Tests/ManageDisplayTest.php
+++ b/core/modules/field_ui/src/Tests/ManageDisplayTest.php
@@ -514,7 +514,7 @@ function assertNodeViewTextHelper(EntityInterface $node, $view_mode, $text, $mes
$clone = clone $node;
$element = node_view($clone, $view_mode);
$output = \Drupal::service('renderer')->renderRoot($element);
- $this->verbose(t('Rendered node - view mode: @view_mode', array('@view_mode' => $view_mode)) . '' . $output);
+ $this->verbose(t('Rendered node - view mode: @view_mode', array('@view_mode' => $view_mode)) . '' . $output);
// Assign content so that WebTestBase functions can be used.
$this->setRawContent($output);
diff --git a/core/modules/field_ui/src/Tests/ManageFieldsTest.php b/core/modules/field_ui/src/Tests/ManageFieldsTest.php
index cbe9f53..5f0e927 100644
--- a/core/modules/field_ui/src/Tests/ManageFieldsTest.php
+++ b/core/modules/field_ui/src/Tests/ManageFieldsTest.php
@@ -347,7 +347,7 @@ protected function addPersistentFieldStorage() {
$this->assertRaw(t('Re-use an existing field'), '"Re-use existing field" was found.');
// Ensure that we test with a label that contains HTML.
- $label = $this->randomString(4) . ' ' . $this->randomString(4);
+ $label = $this->randomString(4) . ' ' . $this->randomString(4);
// Add a new field for the orphaned storage.
$this->fieldUIAddExistingField("admin/structure/types/manage/page", $this->fieldName, $label);
}
diff --git a/core/modules/file/templates/file-upload-help.html.twig b/core/modules/file/templates/file-upload-help.html.twig
index 8fa6b3e..07be817 100644
--- a/core/modules/file/templates/file-upload-help.html.twig
+++ b/core/modules/file/templates/file-upload-help.html.twig
@@ -11,4 +11,4 @@
* @ingroup themeable
*/
#}
-{{ descriptions|safe_join(' ') }}
+{{ descriptions|safe_join(' ') }}
diff --git a/core/modules/forum/forum.module b/core/modules/forum/forum.module
index 8d4a9f4..9461277 100644
--- a/core/modules/forum/forum.module
+++ b/core/modules/forum/forum.module
@@ -499,7 +499,7 @@ function template_preprocess_forums(&$variables) {
else {
$new_replies = '';
if ($topic->new_replies) {
- $new_replies = ' ' . $topic->new_text . '';
+ $new_replies = ' ' . $topic->new_text . '';
}
$row[] = array(
diff --git a/core/modules/forum/templates/forum-list.html.twig b/core/modules/forum/templates/forum-list.html.twig
index c2e5567..003f6ea 100644
--- a/core/modules/forum/templates/forum-list.html.twig
+++ b/core/modules/forum/templates/forum-list.html.twig
@@ -64,7 +64,7 @@
' . t('The possible values this field can contain. Enter one value per line, in the format key|label.');
- $description .= ' ' . t('The key is the stored value, and must be numeric. The label will be used in displayed values and edit forms.');
- $description .= ' ' . t('The label is optional: if a line contains a single number, it will be used as key and label.');
- $description .= ' ' . t('Lists of labels are also accepted (one label per line), only if the field does not hold any values yet. Numeric keys will be automatically generated from the positions in the list.');
+ $description .= ' ' . t('The key is the stored value, and must be numeric. The label will be used in displayed values and edit forms.');
+ $description .= ' ' . t('The label is optional: if a line contains a single number, it will be used as key and label.');
+ $description .= ' ' . t('Lists of labels are also accepted (one label per line), only if the field does not hold any values yet. Numeric keys will be automatically generated from the positions in the list.');
$description .= '
';
$description .= '
' . t('Allowed HTML tags in labels: @tags', array('@tags' => $this->displayAllowedTags())) . '
';
return $description;
diff --git a/core/modules/options/src/Plugin/Field/FieldType/ListIntegerItem.php b/core/modules/options/src/Plugin/Field/FieldType/ListIntegerItem.php
index 719ae48..f80850c 100644
--- a/core/modules/options/src/Plugin/Field/FieldType/ListIntegerItem.php
+++ b/core/modules/options/src/Plugin/Field/FieldType/ListIntegerItem.php
@@ -51,9 +51,9 @@ public static function schema(FieldStorageDefinitionInterface $field_definition)
*/
protected function allowedValuesDescription() {
$description = '
' . t('The possible values this field can contain. Enter one value per line, in the format key|label.');
- $description .= ' ' . t('The key is the stored value, and must be numeric. The label will be used in displayed values and edit forms.');
- $description .= ' ' . t('The label is optional: if a line contains a single number, it will be used as key and label.');
- $description .= ' ' . t('Lists of labels are also accepted (one label per line), only if the field does not hold any values yet. Numeric keys will be automatically generated from the positions in the list.');
+ $description .= ' ' . t('The key is the stored value, and must be numeric. The label will be used in displayed values and edit forms.');
+ $description .= ' ' . t('The label is optional: if a line contains a single number, it will be used as key and label.');
+ $description .= ' ' . t('Lists of labels are also accepted (one label per line), only if the field does not hold any values yet. Numeric keys will be automatically generated from the positions in the list.');
$description .= '
';
$description .= '
' . t('Allowed HTML tags in labels: @tags', array('@tags' => $this->displayAllowedTags())) . '
';
return $description;
diff --git a/core/modules/options/src/Plugin/Field/FieldType/ListStringItem.php b/core/modules/options/src/Plugin/Field/FieldType/ListStringItem.php
index f5440ab..fa71eab 100644
--- a/core/modules/options/src/Plugin/Field/FieldType/ListStringItem.php
+++ b/core/modules/options/src/Plugin/Field/FieldType/ListStringItem.php
@@ -54,8 +54,8 @@ public static function schema(FieldStorageDefinitionInterface $field_definition)
*/
protected function allowedValuesDescription() {
$description = '
' . t('The possible values this field can contain. Enter one value per line, in the format key|label.');
- $description .= ' ' . t('The key is the stored value. The label will be used in displayed values and edit forms.');
- $description .= ' ' . t('The label is optional: if a line contains a single string, it will be used as key and label.');
+ $description .= ' ' . t('The key is the stored value. The label will be used in displayed values and edit forms.');
+ $description .= ' ' . t('The label is optional: if a line contains a single string, it will be used as key and label.');
$description .= '
';
$description .= '
' . t('Allowed HTML tags in labels: @tags', array('@tags' => $this->displayAllowedTags())) . '
';
return $description;
diff --git a/core/modules/responsive_image/responsive_image.module b/core/modules/responsive_image/responsive_image.module
index d654c81..d7b2216 100644
--- a/core/modules/responsive_image/responsive_image.module
+++ b/core/modules/responsive_image/responsive_image.module
@@ -284,9 +284,9 @@ function responsive_image_build_source_attributes(ImageInterface $image, array $
* The above responsive image style will result in a