Révision dd54aff9
Ajouté par Assos Assos il y a plus de 10 ans
htmltest/sites/all/modules/entity/views/handlers/entity_views_field_handler_helper.inc | ||
---|---|---|
157 | 157 |
} |
158 | 158 |
|
159 | 159 |
if (method_exists($handler->query, 'get_result_wrappers')) { |
160 |
list($handler->entity_type, $handler->wrappers) = $handler->query->get_result_wrappers($values, $handler->relationship, $handler->real_field);
|
|
160 |
list($handler->entity_type, $handler->wrappers) = $handler->query->get_result_wrappers($values, NULL, $handler->real_field);
|
|
161 | 161 |
} |
162 | 162 |
else { |
163 |
list($handler->entity_type, $entities) = $handler->query->get_result_entities($values, $handler->relationship, $handler->real_field);
|
|
163 |
list($handler->entity_type, $entities) = $handler->query->get_result_entities($values, NULL, $handler->real_field);
|
|
164 | 164 |
$handler->wrappers = array(); |
165 | 165 |
foreach ($entities as $id => $entity) { |
166 | 166 |
$handler->wrappers[$id] = entity_metadata_wrapper($handler->entity_type, $entity); |
... | ... | |
196 | 196 |
if ($handler->relationship) { |
197 | 197 |
$current_handler = $handler; |
198 | 198 |
$view = $current_handler->view; |
199 |
while (!empty($current_handler->relationship) && !empty($view->relationship[$current_handler->relationship])) { |
|
200 |
$current_handler = $view->relationship[$current_handler->relationship]; |
|
199 |
$relationships = array(); |
|
200 |
// Collect all relationships, keyed by alias. |
|
201 |
foreach ($view->relationship as $key => $relationship) { |
|
202 |
$key = $relationship->alias ? $relationship->alias : $key; |
|
203 |
$relationships[$key] = $relationship; |
|
204 |
} |
|
205 |
while (!empty($current_handler->relationship) && !empty($relationships[$current_handler->relationship])) { |
|
206 |
$current_handler = $relationships[$current_handler->relationship]; |
|
201 | 207 |
$return = $current_handler->real_field . ($return ? ":$return" : ''); |
202 | 208 |
} |
203 | 209 |
} |
Formats disponibles : Unified diff
Weekly update of contrib modules