Skip to content

Fix image previews on Drupal > 7.20 #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Daft-Freak wants to merge 1 commit into
base: master
Choose a base branch
from
+3 −3
Open

Fix image previews on Drupal > 7.20 #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions oga/oga.module
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ function oga_field_formatter_view($entity_type, $entity, $field, $instance, $lan
if($mime[0] == 'image') {
#dsm($entity);
$path = drupal_get_path_alias("node/{$entity->nid}");
$output .= "<img src='" . file_create_url(image_style_path($imagestyle[$display['type']], $item['uri'])) . "' alt='Preview'>";
$output .= "<img src='" . image_style_url($imagestyle[$display['type']], $item['uri']) . "' alt='Preview'>";
$output = l($output, $path, array('html' => true));
$element[$delta] = array('#markup' => $output);
} elseif($mime[0] == 'audio' || $item['filemime'] == 'application/ogg') {
Expand All @@ -338,7 +338,7 @@ function oga_field_formatter_view($entity_type, $entity, $field, $instance, $lan
if($mime[0] == 'image') {
#dsm($entity);
$path = file_create_url($item['uri']);
$output .= "<img src='" . file_create_url(image_style_path($imagestyle['art_preview_multiple'], $item['uri'])) . "' alt='Preview'>";
$output .= "<img src='" . image_style_url($imagestyle['art_preview_multiple'], $item['uri']) . "' alt='Preview'>";
$output = l($output, $path,
array(
'html' => true,
Expand Down Expand Up @@ -389,7 +389,7 @@ function _oga_audio_preview($item, $mime, $entity_type, $entity, $field, $instan

$mp3_url = file_create_url($mp3_uri);
$ogg_url = file_create_url($ogg_uri);
$img = file_create_url(_oga_get_audio_image_uri(image_style_path($imagestyle[$display['type']], $item['uri'])));
$img = image_style_url($imagestyle[$display['type']], _oga_get_audio_image_uri($item['uri']));
#image_style_path($imagestyle[$display['type']], $item['uri'])
$output = "<div class='{$display['type']} audio-preview' data-display-type='{$display['type']}'><div class='audio-preview-container display-type-{$imagestyle[$display['type']]}'><img class='audio-image' src='$img'><div class='play-button' data-ogg-url='$ogg_url' data-mp3-url='$mp3_url'></div></div></div>";
#$output = "<audio src='$url' controls='controls' class='{$display['type']}'></audio>";
Expand Down