Site and url wrong when indexing multilingual content (using i18n module) - causes REGRESSION

When indexing multilingual content (pages) created using the i18n module (using language prefixes), both the site and url field in the Solr index will be wrong, they always point to the node in the default language instead of the language specified for the node in question. This can be fixed by explicitly passing the entity language in all url calls in _apachesolr_index_process_entity_get_document (in apachesolr.index.inc).

I changed it as follows (might not be the most performant way to do this, but it seems to work) :

function _apachesolr_index_process_entity_get_document($entity, $entity_type) {
  list($entity_id, $vid, $bundle) = entity_extract_ids($entity_type, $entity);

  $document = new ApacheSolrDocument();
  $languages = language_list();
  $urlOptions = array('absolute' => true);
  if (!empty($entity->language)) {
    $urlOptions = $urlOptions + array('language' => $languages[$entity->language]);
  }
  $document->id = apachesolr_document_id($entity_id, $entity_type);
  $document->site = url(null, $urlOptions);
  $document->hash = apachesolr_site_hash();

  $document->entity_id = $entity_id;
  $document->entity_type = $entity_type;
  $document->bundle = $bundle;
  $document->bundle_name = entity_bundle_label($entity_type, $bundle);

  $path = entity_uri($entity_type, $entity);
  // A path is not a requirement of an entity
  if (!empty($path)) {
    $document->path = $path['path'];
    $document->url = url($path['path'], $path['options'] + $urlOptions);
  }
  if (empty($entity->language)) {
    // 'und' is the language-neutral code in Drupal 7.
    $document->language = LANGUAGE_NONE;
  }
  else {
    $document->language = $entity->language;
  }

  // Path aliases can have important information about the content.
  // Add them to the index as well.
  if (function_exists('drupal_get_path_alias')) {
    // Add any path alias to the index, looking first for language specific
    // aliases but using language neutral aliases otherwise.
    $output = drupal_get_path_alias($document->path, $document->language);
    if ($output && $output != $document->path) {
      $document->path_alias = $output;
    }
  }
  return $document;
}