bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Merge pull request #5976 from MrPetovan/bug/5975-add-missing-l10n-poplang

Browse source 
Add missing L10n::popLang calls
This commit is contained in:
Michael Vogel 2018-10-21 09:40:49 +02:00 committed by GitHub
parent b6075de6f8 4ffcb77554
commit 614a549d28
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/enotify.php
View file

@ -134,6 +134,7 @@ function notification($params)
$thread = Item::selectFirstThreadForUser($params['uid'] ,['ignored'], ['iid' => $parent_id]);
if (DBA::isResult($thread) && $thread["ignored"]) {
logger("Thread ".$parent_id." will be ignored", LOGGER_DEBUG);
L10n::popLang();
return;
}
@ -628,6 +629,7 @@ function notification($params)
'$content_allowed' => $content_allowed,
]);
L10n::popLang();
// use the Emailer class to send the message
return Emailer::send(
[
@ -643,6 +645,7 @@ function notification($params)
);
}
L10n::popLang();
return false;
}

8
src/Database/DBStructure.php
View file

@ -77,10 +77,9 @@ class DBStructure
The friendica developers released update %s recently,
but when I tried to install it, something went terribly wrong.
This needs to be fixed soon and I can't do it alone. Please contact a
friendica developer if you can not help me on your own. My database might be invalid."));
$body = L10n::t("The error message is\n[pre]%s[/pre]");
$preamble = sprintf($preamble, $update_id);
$body = sprintf($body, $error_message);
friendica developer if you can not help me on your own. My database might be invalid.",
$update_id));
$body = L10n::t("The error message is\n[pre]%s[/pre]", $error_message);
notification([
'uid' => $admin['uid'],
@ -90,6 +89,7 @@ class DBStructure
'body' => $body,
'language' => $lang]
);
L10n::popLang();
}
//try the logger