Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-24 05:50:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #9724 from MrPetovan/bug/notices

Browse source 
Various improvements
This commit is contained in:
Michael Vogel 2020-12-31 17:30:50 +01:00 • committed by GitHub
commit 54db693e16
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/Module/Special/HTTPException.php
View file

@ -69,9 +69,15 @@ class HTTPException
$message = $explanation[$e->getCode()] ?? '';
}
$vars = ['$title' => $title, '$message' => $message, '$back' => DI::l10n()->t('Go back')];
$vars = [
'$title' => $title,
'$message' => $message,
'$back' => DI::l10n()->t('Go back'),
'$stack_trace' => DI::l10n()->t('Stack trace:'),
];
if (is_site_admin()) {
$vars['$thrown'] = DI::l10n()->t('Exception thrown in %s:%d', $e->getFile(), $e->getLine());
$vars['$trace'] = $e->getTraceAsString();
}

2
src/Util/ACLFormatter.php
View file

@ -84,7 +84,7 @@ final class ACLFormatter
private function sanitizeItem(string &$item) {
// The item is an ACL int value
if (intval($item)) {
$item = '<' . intval(Strings::escapeTags(trim($item))) . '>';
$item = '<' . intval($item) . '>';
// The item is a allowed ACL character
} elseif (in_array($item, [Group::FOLLOWERS, Group::MUTUALS])) {
$item = '<' . $item . '>';