friendica
/
friendica
mirror of https://git.friendi.ca/friendica/friendica.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix for not loading the translation / some more notice removed (#5569)

pull/5572/head
Michael Vogel 2018-08-06 12:11:17 +02:00 committed by Tobias Diekershoff
parent ef1c73fb6b
commit 5e61caa34f
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Core/L10n.php
View File

@ -180,6 +180,8 @@ class L10n extends BaseObject
*/ */
public static function tt($singular, $plural, $count) public static function tt($singular, $plural, $count)
{ {
$a = self::getApp();
$lang = Config::get('system', 'language'); $lang = Config::get('system', 'language');
if (!empty($a->strings[$singular])) { if (!empty($a->strings[$singular])) {

6
src/Worker/Delivery.php
View File

@ -275,6 +275,12 @@ class Delivery extends BaseObject
$user = DBA::selectFirst('user', [], ['uid' => $target_uid]); $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); $target_importer = array_merge($target_importer, $user);
// Set the user id. This is important if this is a public contact // Set the user id. This is important if this is a public contact