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

[yaffs-website] / web / modules / contrib / fontyourface / src / Form / FontDisplayForm.php

diff --git a/web/modules/contrib/fontyourface/src/Form/FontDisplayForm.php b/web/modules/contrib/fontyourface/src/Form/FontDisplayForm.php
index cf8bf7b8cf72fa1a1c2cd1432ccc344a0c472aa9..23b51276a49b5f696b769ab7341d036bda818f18 100644 (file)
--- a/web/modules/contrib/fontyourface/src/Form/FontDisplayForm.php
+++ b/web/modules/contrib/fontyourface/src/Form/FontDisplayForm.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\fontyourface\Form;
 
+use Drupal\Core\Url;
 use Drupal\Core\Entity\EntityForm;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\fontyourface\FontDisplayInterface;
@@ -41,11 +42,13 @@ class FontDisplayForm extends EntityForm {
 
     /* You will need additional form elements for your custom properties. */
 
-    $fonts = Font::loadEnabledFonts();
+    $fonts = Font::loadActivatedFonts();
     if (empty($fonts)) {
-      drupal_set_message($this->t('Please select at least one font before picking a font style.'));
-      $form_state->setRedirect('entity.font.collection');
+      drupal_set_message($this->t('Please enable at least one font before creating/updating a font style.'), 'warning');
+      $this->redirect('entity.font.collection')->send();
+      exit();
     }
+
     $available_fonts = [];
     foreach ($fonts as $font) {
       $available_fonts[$font->url->value] = $font->name->value;