Project

General

Profile

Revision d756b39a

Added by Assos Assos about 8 years ago

Weekly update of contrib modules

View differences:

drupal7/sites/all/modules/date_ical/includes/date_ical_plugin_row_ical_entity.inc
284 284
          }
285 285
          $location = implode(', ', $location_data);
286 286
        }
287
        elseif ($location_info['type'] == 'node_reference') {
288
        // Make sure this Node Reference actually references a node.
289
          if ($location_field['nid']) {
290
            $node = node_load($location_field['nid']);
291
            $location = $node->title;
292
          }
293
        }
294
        elseif ($location_info['type'] == 'taxonomy_term_reference') {
295
          $terms = taxonomy_term_load_multiple(array_column($items,'tid'));
296
          // Make sure that there are terms that were loaded.
297
          if ($terms) {
298
            $term_names = array();
299
            foreach ($terms as $term) {
300
              $term_names[] = $term->name;
301
            }
302
            $location = implode(', ', $term_names);
303
          }
304
        }
287 305
        else {
288 306
          $location = $location_field['value'];
289 307
        }
......
314 332
          }
315 333
        }
316 334
        elseif ($summary_info['type'] == 'taxonomy_term_reference') {
317
          $terms = taxonomy_term_load_multiple($items);
335
          $terms = taxonomy_term_load_multiple(array_column($items,'tid'));
318 336
          // Make sure that there are terms that were loaded.
319 337
          if ($terms) {
320 338
            $term_names = array();

Also available in: Unified diff