Alias language saved as "und" though node language is "en".

I'm currently working on a website with the locale and entity_translation modules enabled, and have noticed that aliases are saved with the language as und when the node has a different language such as "en".

I've looked at the pathauto_entity_language() function and I'm querying the order of the if statements within the function.

This is the original version:

function pathauto_entity_language($entity_type, $entity, $check_language_property = TRUE) {
  $langcode = NULL;

  if (function_exists('entity_language')) {
    $langcode = entity_language($entity_type, $entity);
  }
  elseif ($check_language_property && !empty($entity->language)) {
    $langcode = $entity->language;
  }

  return !empty($langcode) ? $langcode : LANGUAGE_NONE;
}

The entity_language function is stored within a core file - includes/common.inc - so that's always going to be present and the second condition isn't going to be executed.

Besides that, I think that it would be better to use the entity property as the first attempt, and only fallback to the entity type language when needed. This certainly seems to have fixed my issue.

I'll post a patch with my changes for review and clarification.