Fix for not loading the translation / some more notice removed (#5569)
This commit is contained in:
parent
ef1c73fb6b
commit
5e61caa34f
|
@ -180,6 +180,8 @@ class L10n extends BaseObject
|
|||
*/
|
||||
public static function tt($singular, $plural, $count)
|
||||
{
|
||||
$a = self::getApp();
|
||||
|
||||
$lang = Config::get('system', 'language');
|
||||
|
||||
if (!empty($a->strings[$singular])) {
|
||||
|
|
|
@ -275,6 +275,12 @@ class Delivery extends BaseObject
|
|||
|
||||
$user = DBA::selectFirst('user', [], ['uid' => $target_uid]);
|
||||
|
||||
// This should also never fail
|
||||
if (!DBA::isResult($user)) {
|
||||
logger('No user found for uid ' . $target_uid);
|
||||
return;
|
||||
}
|
||||
|
||||
$target_importer = array_merge($target_importer, $user);
|
||||
|
||||
// Set the user id. This is important if this is a public contact
|
||||
|
|
Loading…
Reference in a new issue