Fix common and admin translations were sometimes missing

This commit is contained in:
nathangray 2016-07-11 16:23:58 -06:00
parent 983cfab70d
commit b195d44cbf

View File

@ -608,6 +608,11 @@ class Translation
self::$load_via[$l_app][] = $app_dir; self::$load_via[$l_app][] = $app_dir;
$updated_load_via = true; $updated_load_via = true;
} }
else if ($l_app != $app_dir &&
array_intersect((array)self::$load_via[$l_app], array('all-apps', $app_dir)))
{
$loaded[$l_id] = $l_translation;
}
continue; continue;
} }
$loaded[$l_id] = $l_translation; $loaded[$l_id] = $l_translation;