Mercurial > hg > isophonics-drupal-site
diff core/lib/Drupal/Core/Render/Renderer.php @ 16:c2387f117808
Routine composer update
author | Chris Cannam |
---|---|
date | Tue, 10 Jul 2018 15:07:59 +0100 |
parents | 1fec387a4317 |
children | 129ea1e6d783 |
line wrap: on
line diff
--- a/core/lib/Drupal/Core/Render/Renderer.php Thu Apr 26 11:26:54 2018 +0100 +++ b/core/lib/Drupal/Core/Render/Renderer.php Tue Jul 10 15:07:59 2018 +0100 @@ -380,7 +380,7 @@ } // All render elements support #markup and #plain_text. - if (!empty($elements['#markup']) || !empty($elements['#plain_text'])) { + if (isset($elements['#markup']) || isset($elements['#plain_text'])) { $elements = $this->ensureMarkupIsSafe($elements); } @@ -744,11 +744,7 @@ * @see \Drupal\Component\Utility\Xss::filterAdmin() */ protected function ensureMarkupIsSafe(array $elements) { - if (empty($elements['#markup']) && empty($elements['#plain_text'])) { - return $elements; - } - - if (!empty($elements['#plain_text'])) { + if (isset($elements['#plain_text'])) { $elements['#markup'] = Markup::create(Html::escape($elements['#plain_text'])); } elseif (!($elements['#markup'] instanceof MarkupInterface)) {