Default value not found

I'm able to successfully pull in a referenced value and save it to the database for a given node, but when I go back to edit the page, the value doesn't show in the autocomplete field anymore.

I tracked this down to these lines:

    // If the language is set and not null add it as a query param.
    if (isset($language->language) && $language->language != 'und') {
      $field_query[] = 'ss_language: ' . $language->language;
    }

The entity is set with the ss_language value set to 'und' but my default language is 'en' as defined in language_default().

So it's searching for a value of 'en' instead of 'und'.

I'm not using translation of any kind, so I'm not sure what the best solution is. I think you can change the query to search for the defined language OR 'und' like this:

   // If the language is set and not null add it as a query param.
    if (isset($language->language) && $language->language != 'und') {
      $field_query[] = 'ss_language: "' . $language->language . '" OR "und"';
    }

But I'm not sure if that would mean that if you did have both 'und' and 'en' values that sometimes you'd get 'und' and sometimes you'd get 'en' or what.

Alternatively, you can compare the language on the requesting entity with the given language, and if they're the same, don't bother with checking ss_language at all. That's what I'm attempting to do with the attached patch.

I'm definitely not sure this is the correct method though.