Skip to content

Issue #37. Fix file field tokens #38

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
argiepiano wants to merge 1 commit into
base: 1.x-2.x
Choose a base branch
from
Open

Issue #37. Fix file field tokens #38

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
21 changes: 2 additions & 19 deletions entity_token.tokens.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,12 +276,7 @@ function entity_token_tokens($type, $tokens, array $data = array(), array $optio
if (empty($name_parts[0]) && $name_parts[0] != '0') {
continue;
}
if ($token_type_from_wrapper == 'file') {
// Get the file object from the wrapper. We send the object (not the wrapper) to core
// file tokens fulfilled in system_tokens().
$new_data = $wrapper->file->value();

} elseif ($token_type_from_wrapper == 'struct') {
if ($token_type_from_wrapper == 'struct') {
// If this is a struct we'll pass the wrapper verbatim
$new_data = $wrapper;

Expand Down Expand Up @@ -347,11 +342,6 @@ function entity_token_tokens($type, $tokens, array $data = array(), array $optio
// We pass the wrapper to the element.
$pass_data = $data[$type]->get($name_parts[0]);
break;

case 'file':
// We need to pass the file object.
$pass_data = $data[$type]->get($name_parts[0])->file->value();
break;

default:
// We pass the value, since most likely this is not fulfilled in this module
Expand Down Expand Up @@ -509,26 +499,19 @@ function _entity_token_get_token_type_from_property_type($field_type) {
switch ($field_type) {
case 'taxonomy_term':
return 'term';
break;

case 'datetime':
case 'date':
case 'datestamp':
return 'date';
break;

case 'field_item_file':
return 'file';
break;

case 'text_formatted':
case 'field_item_link':
case 'field_item_file':
return 'struct';
break;

case 'field_item_image':
return 'image';
break;

default:
return $field_type;
Expand Down