diff core/modules/text/text.module @ 14:1fec387a4317

Update Drupal core to 8.5.2 via Composer

--- a/core/modules/text/text.module	Mon Apr 23 09:33:26 2018 +0100
+++ b/core/modules/text/text.module	Mon Apr 23 09:46:53 2018 +0100
@@ -81,11 +81,11 @@
 
   // Retrieve the filters of the specified text format, if any.
   if (isset($format)) {
-    $filters = FilterFormat::load($format)->filters();
+    $filter_format = FilterFormat::load($format);
     // If the specified format does not exist, return nothing. $text is already
     // filtered text, but the remainder of this function will not be able to
     // ensure a sane and secure summary.
-    if (!$filters) {
+    if (!$filter_format || !($filters = $filter_format->filters())) {
       return '';
     }
   }