Changeset 26312


Ignore:
Timestamp:
06/10/10 17:57:04 (7 years ago)
Author:
jval
Message:

Fix r26310, refs #1626

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/ragnaroek/midcom/midcom.core/midcom/services/multilang.php

    r26310 r26312  
    195195            if ($strict)
    196196            {
    197                 if ($object_in_lang->lang != $object->lang)
     197                $object_lang = null;
     198                try
     199                {
     200                    $language = new midgard_language($object_in_lang->lang);
     201                    $object_lang = $language->code;
     202                }
     203                catch (Exception $e)
     204                {
     205                    // Nothing to do. If DB is missing the language, strict fails then.
     206                }
     207
     208                if ($object_lang != $lang)
    198209                {
    199210                    $object_in_lang = null;
Note: See TracChangeset for help on using the changeset viewer.