friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #7202 from MrPetovan/bug/fatal-errors 

Prevent fatal error in ACL::getFullSelectorHTML when accessing a profile as a remote visitor
This commit is contained in:
Philipp 2019-05-29 07:05:05 +02:00 committed by GitHub
parent 64f51d337f 5414d51d4c
commit dc0978141c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Core/ACL.php
View File

@ -259,7 +259,7 @@ class ACL extends BaseObject
* @return string * @return string
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/ */
public static function getFullSelectorHTML(array $user, $show_jotnets = false, array $default_permissions = []) public static function getFullSelectorHTML(array $user = null, $show_jotnets = false, array $default_permissions = [])
{ {
// Defaults user permissions // Defaults user permissions
if (empty($default_permissions)) { if (empty($default_permissions)) {
@ -314,7 +314,7 @@ class ACL extends BaseObject
'$aclModalTitle' => L10n::t('Permissions'), '$aclModalTitle' => L10n::t('Permissions'),
'$aclModalDismiss' => L10n::t('Close'), '$aclModalDismiss' => L10n::t('Close'),
'$features' => [ '$features' => [
'aclautomention' => Feature::isEnabled($user['uid'], 'aclautomention') ? 'true' : 'false' 'aclautomention' => !empty($user['uid']) && Feature::isEnabled($user['uid'], 'aclautomention') ? 'true' : 'false'
], ],
]); ]);