From c2a7cf3cd7cdf9a36a229c985f66a06572403d07 Mon Sep 17 00:00:00 2001 From: Alexander O'Neill Date: Tue, 16 Aug 2022 23:52:39 -0300 Subject: [PATCH] Drupal 10 compatibility fixes. --- media_attribution.info.yml | 2 +- media_attribution.module | 6 +++--- src/LicenseLoader.php | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/media_attribution.info.yml b/media_attribution.info.yml index d57dac6..6ebecbf 100644 --- a/media_attribution.info.yml +++ b/media_attribution.info.yml @@ -1,7 +1,7 @@ name: 'Media Attribution' type: module description: 'Attach attribution and license info to media entities.' -core_version_requirement: ^8 || ^9 +core_version_requirement: ^9.3 || ^10 package: 'media' dependencies: - drupal:media diff --git a/media_attribution.module b/media_attribution.module index be9e37b..8abf5e4 100644 --- a/media_attribution.module +++ b/media_attribution.module @@ -152,7 +152,7 @@ function media_attribution_preprocess_entity_embed_container(&$variables) { $variables['children'] = [ 'first' => [ '#type' => 'markup', - '#markup' => render($variables['children']) + '#markup' => \Drupal::service('renderer')->render($variables['children']) ], $attribution_text ]; @@ -162,12 +162,12 @@ function media_attribution_preprocess_entity_embed_container(&$variables) { * Read the list of pre-defined Creative Commons media_attribution_licenses and create corresponding taxonomy terms. */ function media_attribution_load_default_licenses() { - $file_path = drupal_get_path('module', 'media_attribution') . '/media_attribution.default.licenses.yml'; + $file_path = \Drupal::service('extension.list.module')->getPath('media_attribution') . '/media_attribution.default.licenses.yml'; $file_contents = file_get_contents($file_path); $license_data = Yaml::decode($file_contents); foreach ($license_data as $license_item) { - $icon_file_path = drupal_get_path('module', 'media_attribution') . "/" . $license_item['icon_file']; + $icon_file_path = \Drupal::service('extension.list.module')->getPath('media_attribution') . "/" . $license_item['icon_file']; LicenseLoader::createLicenseTerm($license_item['title'],$license_item['short_label'], $icon_file_path, $license_item['url']); } } diff --git a/src/LicenseLoader.php b/src/LicenseLoader.php index 5aa500c..e75fd52 100644 --- a/src/LicenseLoader.php +++ b/src/LicenseLoader.php @@ -28,6 +28,7 @@ class LicenseLoader { */ public static function createOrUpdateLicenseTerm($term_title, $term_short_label, $icon_file_path, $license_url) { $tids = array_values(\Drupal::entityQuery('taxonomy_term') + ->accessCheck(TRUE) ->condition('name', $term_title) ->execute()); @@ -140,4 +141,4 @@ class LicenseLoader { } return $icon_file; } -} \ No newline at end of file +}