Merge tag '7.x-2.36' into 7.x-2.x

uw_ct_event.features.field_instance.inc

@@ -679,16 +679,14 @@ function uw_ct_event_field_default_field_instances() {
         'settings' => array(
           'address' => array(
             'show' => 1,
-            'text' => '<div property="schema:location" typeof="schema:Place">
-  <span property="schema:name">[node:field_event_location:name:0]</span>
+            'text' => '<span property="schema:name">[node:field_event_location:name:0]</span>
   <div property="schema:address" typeof="schema:PostalAddress">
     <span property="schema:streetAddress">[node:field_event_location:additional:0]<br>[node:field_event_location:street:0]</span><br>
     <span property="schema:addressLocality">[node:field_event_location:city:0]</span>,
     <span property="schema:addressRegion">[node:field_event_location:province:0]</span>
     <span property="schema:postalCode">[node:field_event_location:postal_code:0]</span><br>
     <span property="schema:addressCountry">[node:field_event_location:country_name:0]</span><br>
-  </div>
-</div>',
+  </div>',
           ),
           'height' => 300,
           'icon' => array(

uw_ct_event.module

@@ -1094,6 +1094,17 @@ function uw_ct_event_theme_registry_alter(&$theme_registry) {
   );
 }
 
+/**
+ * Implements hook_preprocess_HOOK().
+ *
+ * Add typeof="schema:Place" to fields with property="schema:location".
+ */
+function uw_ct_event_preprocess_field(&$variables) {
+  if (isset($variables['item_attributes_array'][0]['property'][0]) && $variables['item_attributes_array'][0]['property'][0] === 'schema:location' && !isset($variables['item_attributes_array'][0]['typeof'][0])) {
+    $variables['item_attributes_array'][0]['typeof'][0] = 'schema:Place';
+  }
+}
+
 /**
  * Implements hook_theme().
  *