GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[TheFreeNetwork] Fix invalid index on lookup

Browse Source
This commit is contained in:
Diogo Cordeiro 2020-08-29 20:14:21 +01:00 committed by Diogo Peralta Cordeiro
parent 82f1fc7ca2
commit cb78573f59
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/TheFreeNetwork/TheFreeNetworkModule.php
View File

@ -77,12 +77,12 @@ class TheFreeNetworkModule extends Module
* @param string $uri * @param string $uri
* @param string $class profile class that triggered this event * @param string $class profile class that triggered this event
* @param int|null &$profile_id Profile:id associated with the remote entity found * @param int|null &$profile_id Profile:id associated with the remote entity found
* @return bool hook flag * @return bool hook flag false
* @throws AlreadyHandledException Do not allow to create a profile if a preferred protocol already has one * @throws AlreadyHandledException Do not allow to create a profile if a preferred protocol already has one
*/ */
public function onStartTFNLookup(string $uri, string $class, int &$profile_id = null): bool public function onStartTFNLookup(string $uri, string $class, int &$profile_id = null): bool
{ {
[$profile_id, $cls] = $this->lookup($uri, $class); [$profile_id, $cls] = $this->lookup($uri, $class) ?? [null, null];
if (is_null($profile_id)) { if (is_null($profile_id)) {
$perf = common_config('performance', 'high'); $perf = common_config('performance', 'high');
@ -93,8 +93,8 @@ class TheFreeNetworkModule extends Module
} }
} }
// Lower means higher priority // $cls being lower then $class means it has a higher priority (comes first) @see $this->onInitializePlugin()
if ($this->priority[$cls] < $this->priority[$class]) { if (!is_null($profile_id) && $this->priority[$cls] < $this->priority[$class]) {
throw new AlreadyHandledException("TheFreeNetworkModule->AlreadyHandled: $cls is preferred over $class"); throw new AlreadyHandledException("TheFreeNetworkModule->AlreadyHandled: $cls is preferred over $class");
} }