From 270c7aa64ef6d1f9b8380e54887a9648ec6465e6 Mon Sep 17 00:00:00 2001 From: James Sansbury Date: Fri, 28 Jun 2013 17:56:18 -0400 Subject: [PATCH] Issue #2030983: Respect the entity's path language if it is present. --- pathauto.module | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pathauto.module b/pathauto.module index fbbdae3..959c4ba 100644 --- a/pathauto.module +++ b/pathauto.module @@ -417,7 +417,11 @@ function pathauto_action_info() { function pathauto_entity_language($entity_type, $entity, $check_language_property = TRUE) { $langcode = NULL; - if (function_exists('entity_language')) { + // If the language is set on the path already, respect it. + if (isset($entity->path['language'])) { + $langcode = $entity->path['language']; + } + elseif (function_exists('entity_language')) { $langcode = entity_language($entity_type, $entity); } elseif ($check_language_property && !empty($entity->language)) { -- 1.7.10.4