diff --git a/core/includes/batch.inc b/core/includes/batch.inc index 8a8f7f2..97d693d 100644 --- a/core/includes/batch.inc +++ b/core/includes/batch.inc @@ -130,7 +130,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 @@ -185,7 +185,7 @@ function _batch_progress_page() { 'type' => 'setting', 'data' => array( 'batch' => array( - '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 27494e7..0a0adab 100644 --- a/core/includes/bootstrap.inc +++ b/core/includes/bootstrap.inc @@ -1108,7 +1108,7 @@ function _drupal_exception_handler($exception) { 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) . '

'; } } } @@ -1681,7 +1681,7 @@ function _drupal_shutdown_function() { 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/file.inc b/core/includes/file.inc index 6ffb269..581da71 100644 --- a/core/includes/file.inc +++ b/core/includes/file.inc @@ -615,7 +615,7 @@ function file_save_htaccess($directory, $private = TRUE, $force_overwrite = FALS return drupal_chmod($htaccess_path, 0444); } else { - $variables = array('%directory' => $directory, '!htaccess' => '
' . nl2br(String::checkPlain($htaccess_lines))); + $variables = array('%directory' => $directory, '!htaccess' => '
' . nl2br(String::checkPlain($htaccess_lines))); \Drupal::logger('security')->error("Security warning: Couldn't write .htaccess file. Please create a .htaccess file in your %directory directory which contains the following lines: !htaccess", $variables); return FALSE; } diff --git a/core/lib/Drupal/Component/Utility/Html.php b/core/lib/Drupal/Component/Utility/Html.php index 4dd9d27..6b9ec8d 100644 --- a/core/lib/Drupal/Component/Utility/Html.php +++ b/core/lib/Drupal/Component/Utility/Html.php @@ -274,7 +274,7 @@ public static function load($html) { $document = << - + !html EOD; diff --git a/core/lib/Drupal/Core/Session/SessionHandler.php b/core/lib/Drupal/Core/Session/SessionHandler.php index 736aef2..d7950b3 100644 --- a/core/lib/Drupal/Core/Session/SessionHandler.php +++ b/core/lib/Drupal/Core/Session/SessionHandler.php @@ -195,7 +195,7 @@ public function write($sid, $value) { // further uncaught exception being thrown. if (error_displayable()) { print '

Uncaught exception thrown in session handler.

'; - print '

' . Error::renderExceptionSafe($exception) . '

'; + print '

' . Error::renderExceptionSafe($exception) . '

'; } return FALSE; } diff --git a/core/misc/tableselect.js b/core/misc/tableselect.js index a55b97c..6dc53ec 100644 --- a/core/misc/tableselect.js +++ b/core/misc/tableselect.js @@ -28,7 +28,7 @@ }; // Find all with class select-all, and insert the check all checkbox. - $table.find('th.select-all').prepend($('').attr('title', strings.selectAll)).on('click', function (event) { + $table.find('th.select-all').prepend($('').attr('title', strings.selectAll)).on('click', function (event) { if ($(event.target).is('input[type="checkbox"]')) { // Loop through all checkboxes and set their state to the select all checkbox' state. checkboxes.each(function () { diff --git a/core/modules/basic_auth/src/Tests/Authentication/BasicAuthTest.php b/core/modules/basic_auth/src/Tests/Authentication/BasicAuthTest.php index 77e732a..624d32d 100644 --- a/core/modules/basic_auth/src/Tests/Authentication/BasicAuthTest.php +++ b/core/modules/basic_auth/src/Tests/Authentication/BasicAuthTest.php @@ -142,7 +142,7 @@ protected function basicAuthGet($path, $username, $password) { ); $this->verbose('GET request to: ' . $path . - '
' . $out); + '
' . $out); return $out; } diff --git a/core/modules/book/templates/book-export-html.html.twig b/core/modules/book/templates/book-export-html.html.twig index cbeb3b3..ecffb14 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 1315b24..2292e74 100644 --- a/core/modules/ckeditor/js/ckeditor.drupalimage.admin.js +++ b/core/modules/ckeditor/js/ckeditor.drupalimage.admin.js @@ -25,7 +25,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 963436d..6bf713a 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' => t('A list of classes that will be provided in the "Styles" dropdown. Enter one class on each line in the format: element.class|Label. Example: h1.title|Title.
These styles should be available in your theme\'s CSS file.'), + '#description' => t('A list of classes that will be provided in the "Styles" dropdown. Enter one class on each line in the format: element.class|Label. Example: h1.title|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/content_translation/content_translation.module b/core/modules/content_translation/content_translation.module index 5c86c4e..7604bbe 100644 --- a/core/modules/content_translation/content_translation.module +++ b/core/modules/content_translation/content_translation.module @@ -41,7 +41,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('language.admin_overview'))); + $output .= '
' . t('Before you can translate content, there must be at least two languages added on the languages administration page.', array('!url' => \Drupal::url('language.admin_overview'))); } return $output; } diff --git a/core/modules/editor/src/Tests/EditorFileReferenceFilterTest.php b/core/modules/editor/src/Tests/EditorFileReferenceFilterTest.php index e03066e..8a607d7 100644 --- a/core/modules/editor/src/Tests/EditorFileReferenceFilterTest.php +++ b/core/modules/editor/src/Tests/EditorFileReferenceFilterTest.php @@ -66,44 +66,44 @@ function testEditorFileReferenceFilter() { $uuid_2 = $image_2->uuid(); $this->pass('No data-editor-file-uuid attribute.'); - $input = ''; + $input = ''; $output = $test($input); $this->assertIdentical($input, $output->getProcessedText()); $this->pass('One data-editor-file-uuid attribute.'); - $input = ''; + $input = ''; $output = $test($input); $this->assertIdentical($input, $output->getProcessedText()); $this->assertEqual(array('file' => array($id)), $output->getCacheTags()); $this->pass('One data-editor-file-uuid attribute with odd capitalization.'); - $input = ''; + $input = ''; $output = $test($input); $this->assertIdentical($input, $output->getProcessedText()); $this->assertEqual(array('file' => array($id)), $output->getCacheTags()); $this->pass('One data-editor-file-uuid attribute on a non-image tag.'); - $input = '