X-Git-Url: http://www.aleph1.co.uk/gitweb/?a=blobdiff_plain;f=web%2Fmodules%2Fcontrib%2Fslick%2Fsrc%2FSlickFormatter.php;fp=web%2Fmodules%2Fcontrib%2Fslick%2Fsrc%2FSlickFormatter.php;h=3b8db3704d92a7e87135b830b38ddf64a68a05c7;hb=eba34333e3c89f208d2f72fa91351ad019a71583;hp=6173186df5928ca3cfffa702267fcdb0831364f2;hpb=a2bd1bf0c2c1f1a17d188f4dc0726a45494cefae;p=yaffs-website diff --git a/web/modules/contrib/slick/src/SlickFormatter.php b/web/modules/contrib/slick/src/SlickFormatter.php index 6173186df..3b8db3704 100644 --- a/web/modules/contrib/slick/src/SlickFormatter.php +++ b/web/modules/contrib/slick/src/SlickFormatter.php @@ -50,27 +50,32 @@ class SlickFormatter extends BlazyFormatterManager implements SlickFormatterInte $settings['nav'] = FALSE; } - // Only trim overridables options if enabled. - if (empty($settings['override'])) { + // Only trim overridables options if disabled. + if (empty($settings['override']) && isset($settings['overridables'])) { $settings['overridables'] = array_filter($settings['overridables']); } } /** - * Gets the thumbnail image. + * Gets the thumbnail image using theme_image_style(). + * + * @param array $settings + * The array containing: thumbnail_style, etc. + * @param object $item + * The \Drupal\image\Plugin\Field\FieldType\ImageItem object. + * + * @return array + * The renderable array of thumbnail image. */ - public function getThumbnail($settings = []) { + public function getThumbnail(array $settings = [], $item = NULL) { $thumbnail = []; if (!empty($settings['uri'])) { $thumbnail = [ '#theme' => 'image_style', '#style_name' => isset($settings['thumbnail_style']) ? $settings['thumbnail_style'] : 'thumbnail', '#uri' => $settings['uri'], + '#item' => $item, ]; - - foreach (['height', 'width', 'alt', 'title'] as $data) { - $thumbnail["#$data"] = isset($settings[$data]) ? $settings[$data] : NULL; - } } return $thumbnail; }