Updated to Drupal 8.5. Core Media not yet in use.

[yaffs-website] / web / core / modules / text / text.module

diff --git a/web/core/modules/text/text.module b/web/core/modules/text/text.module
index 1932e616496630ea4c5af480c637a4996607d3ac..b88fdc1fd74cb7fff7d2952331ef07dd80818fb4 100644 (file)
--- a/web/core/modules/text/text.module
+++ b/web/core/modules/text/text.module
@@ -81,11 +81,11 @@ function text_summary($text, $format = NULL, $size = NULL) {
 
   // 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 '';
     }
   }