diff --git a/metatag.module b/metatag.module index c2c068a..9500fec 100644 --- a/metatag.module +++ b/metatag.module @@ -889,9 +889,14 @@ function metatag_generate_entity_metatags($entity, $entity_type, $langcode = NUL // Determine the language this entity actually uses. $entity_language = metatag_entity_get_language($entity_type, $entity); + // Take special care of requests with an empty langauge code. + if (empty($langcode)) { + // Assume the entity's language in this case. + $langcode = $entity_language; + } // The requested language is different to the entity's language, look for // a language elsewhere. - if ($entity_language != $langcode) { + elseif (!empty($langcode) && $entity_language != $langcode) { // No language was defined for the entity. if ($entity_language == LANGUAGE_NONE) { $langcode = LANGUAGE_NONE;