Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

[Core] Error page - Main page link fix #7258

Merged
merged 1 commit into from
Jan 4, 2021
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions src/Http/Error.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,26 +47,24 @@ public function __construct(
$uri = $request->getURI();
$baseurl = $uri->getScheme() .'://'. $uri->getAuthority();

$tpl_data = [];
$tpl_data = [
'message' => $message,
'baseurl' => $baseurl,
];

$lorisInstance = $request->getAttribute('loris');
$user = $request->getAttribute('user') ?? new \LORIS\AnonymousUser();


// Add a link to the issue tracker as long as a LORIS Instance object
// is present in the request.
if (! $user instanceof \LORIS\AnonymousUser
&& $lorisInstance !== null
) {
// Add admistrator email.
$contact = $lorisInstance
$tpl_data['contact'] = $lorisInstance
->getConfiguration()
->getSetting('mail')['From'];
$tpl_data = array(
'message' => $message,
'baseurl' => $baseurl,
'contact' => $contact,
);

// Add issue tracker data if the error is encountered by a user with
// the correct permissions.
$canReport = $user->hasAnyPermission(
Expand Down