Default values for mapping per-field is not added correctly

I guess the issue is back since commit 1f7d222d in 7.x-1.x.

foreach (array_keys($mappings) as $key) {
      // Set all values with defaults.
      $defaults = array(
        'dependency plugins' => array('bundle', 'role'),
        'map callback' => FALSE,
        'name callback' => '',
        'hierarchy callback' => FALSE,
        'indexing_callback' => '',
        'index_type' => 'string',
        'facets' => FALSE,
        'facet missing allowed' => FALSE,
        'facet mincount allowed' => FALSE,
        // Field API allows any field to be multi-valued.
        'multiple' => TRUE,
      );
      if ($key !== 'per-field') {
        $mappings[$key] += $defaults;
      }
      else {
        foreach (array_keys($field_mappings[$key]) as $field_key) {
          $mappings[$key][$field_key] += $defaults;
        }
      }

This part is looping a wrong array:

foreach (array_keys($field_mappings[$key]) as $field_key) {
   $mappings[$key][$field_key] += $defaults;
}

Should loop throw $mappings[$key].

foreach (array_keys($mappings[$key]) as $field_key) {
   $mappings[$key][$field_key] += $defaults;
}

Works like a charm. Thank you asgorobets

Indeed, I just noticed this myself. Still true of 7.x-1.6.

#6 is RTBC

Rerolling #6

Still RTBC ;-)

This patch does not fix all problems. I still get:
Warning: array_keys() expects parameter 1 to be array, null given in apachesolr_get_field_mappings() (line 2193 of .../sites/all/modules/apachesolr/apachesolr.module).

Could fix this by replacing

else {

with
elseif (is_array($mappings[$key])) {
at line 2192

I apologize for not having time right how to roll a patch.

This issue has been fixed in dev by #2237113: Bug in apachesolr_get_field_mappings when referencing the field mappings array