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

[yaffs-website] / web / modules / contrib / fontyourface / fontyourface.module

diff --git a/web/modules/contrib/fontyourface/fontyourface.module b/web/modules/contrib/fontyourface/fontyourface.module
index 0f141924fa9666b4debc5f6df9da540e4131ae11..e8d86511a6dfca7717fa17fcfc85bb07f9b5524d 100644 (file)
--- a/web/modules/contrib/fontyourface/fontyourface.module
+++ b/web/modules/contrib/fontyourface/fontyourface.module
@@ -97,7 +97,7 @@ function fontyourface_page_attachments(&$page) {
   $fonts = &drupal_static('fontyourface_fonts', []);
   // Load all enabled fonts regardless of theme if setting allows it.
   if ($config->get('load_all_enabled_fonts')) {
-    foreach (Font::loadEnabledFonts() as $font) {
+    foreach (Font::loadActivatedFonts() as $font) {
       $fonts[$font->url->value] = $font;
     }
   }
@@ -174,8 +174,8 @@ function fontyourface_preprocess_font(array &$variables) {
   }
 
   $variables['attributes']['class'] = ['font'];
-  if ($font->isDisabled()) {
-    $url = Url::fromRoute('entity.font.enable', ['js' => 'nojs', 'font' => $font->id()], ['query' => \Drupal::destination()->getAsArray()]);
+  if ($font->isDeactivated()) {
+    $url = Url::fromRoute('entity.font.activate', ['js' => 'nojs', 'font' => $font->id()], ['query' => \Drupal::destination()->getAsArray()]);
     $url->setOptions(
       [
         'attributes' => [
@@ -191,8 +191,8 @@ function fontyourface_preprocess_font(array &$variables) {
     $text = t('Enable');
     $variables['attributes']['class'][] = 'disabled';
   }
-  if ($font->isEnabled()) {
-    $url = Url::fromRoute('entity.font.disable', ['js' => 'nojs', 'font' => $font->id()], ['query' => \Drupal::destination()->getAsArray()]);
+  if ($font->isActivated()) {
+    $url = Url::fromRoute('entity.font.deactivate', ['js' => 'nojs', 'font' => $font->id()], ['query' => \Drupal::destination()->getAsArray()]);
     $url->setOptions(
       [
         'attributes' => [
@@ -296,7 +296,7 @@ function fontyourface_save_font($font_data) {
   }
   $font->setMetadata(!empty($font_data->metadata) ? $font_data->metadata : []);
   $font->status = FALSE;
-  if ($font->isEnabled()) {
+  if ($font->isActivated()) {
     $font->status = TRUE;
   }
   $font->save();
@@ -379,7 +379,7 @@ function fontyourface_delete($provider) {
  *
  * @param string $message
  *   Log message. This should be a literal string; see
- *   http://drupal.org/node/323101 for more details.
+ *   https://drupal.org/node/323101 for more details.
  * @param array $arguments
  *   Arguments to replace placeholders, if there are any, in $message.
  */