Merge branch 'optionsHook' into 'master'

Update hook_civicrm_fieldOptions for new fieldNames

See merge request !10

areas.php

@@ -70,20 +70,16 @@ function areas_civicrm_container(ContainerBuilder $container) {
 function areas_civicrm_fieldOptions($entity, $field, &$options, $params) {
 	if ($entity == 'Group') {
 		$config = \CRM_Areas_Config::singleton();
-		if ($field == 'custom_'.$config->getGroupAreasCustomFieldId()) {
-			$areas = civicrm_api3('Area', 'get', array('options' => array('limit' => 0)));
-			foreach($areas['values'] as $area) {
-				$options[$area['id']] = $area['title'];
-			}
+		if ($field == 'group_areas.group_areas' || $field == 'custom_'.$config->getGroupAreasCustomFieldId()) {
+			$areas = civicrm_api3('Area', 'get', ['options' => ['limit' => 0]]);
+			$options = array_column($areas['values'], 'title', 'id');
 		}
 	}
 	if ($entity == 'Contact') {
 		$config = CRM_Areas_Config::singleton();
-		if ($field == 'custom_'.$config->getContactAreasCustomFieldId()) {
-			$areas = civicrm_api3('Area', 'get', array('options' => array('limit' => 0)));
-			foreach($areas['values'] as $area) {
-				$options[$area['id']] = $area['title'];
-			}
+		if ($field == 'contact_areas.areas' || $field == 'custom_'.$config->getContactAreasCustomFieldId()) {
+			$areas = civicrm_api3('Area', 'get', ['options' => ['limit' => 0]]);
+			$options = array_column($areas['values'], 'title', 'id');
 		}
 	}
 }