Domain paths not showing on node edit form in case of a language mismatch

I wasn't able to get this patch to apply without running patch -p1 < [patch]. I need this to apply with git apply so I re-rolled the same exact patch but will apply with git apply during a drush make or with curl http://drupal.org/files/[patch-name].patch | git apply -

I need to review this further as I'm not sure this is fixing the problem I'm having. I am unable to see the domain paths, however the patch does not bring them back. I will debug when I get a chance and hopefully come up with a fix. Each of the path fields/labels are set to {display: none} ??

tested : this patch fixes the issue in title. And the issue was really nasty before the patch.

the patch is:

diff --git a/domain_path.module b/domain_path.module
--- a/domain_path.module
+++ b/domain_path.module
@@ -310,7 +310,8 @@ function domain_path_form_node_form_alter(&$form, $form_state) {
foreach ($domains as $domain_id => $domain) {
$path = FALSE;
if ($nid) {
- $path = domain_path_lookup_path('alias', 'node/' . $nid, $domain_id);
+ $lang = empty($form['#node']->language) ? NULL : $form['#node']->language;
+ $path = domain_path_lookup_path('alias', 'node/' . $nid, $domain_id, $lang);
}

$default = '';

I checked the domain_path_lookup_path - function - whether it expects LANGUAGE_NONE or NULL when no-language is set in a non-multilang site.
Patch is ok cause exactly NULL is expected in this case.

So the line
+ $lang = empty($form['#node']->language) ? NULL : $form['#node']->language;

is correctly setting lang to null and NOT to LANGUAGE_NONE when empty...

Just changing the title to avoid confusion with #2908039: Domain paths will not appear on node edit form if there are more than 25 domains

Patch works for me in that I don't lose my existing aliases when saving a translation, however I can't save an alias for a translation - not sure if that's just not supported by the module or actually an issue?

I ended up using patches from #2809155: Support multi language (which includes this patch) and #2033875: Add Entity Translation support.

This module could use a new maintainer, so if anyone is interested, please open an issue.

Committed patch #3

Thanks