Merge pull request #7533 from nupplaphil/bug/friendica-7299

Fixing wrong defaults() usage
This commit is contained in:
Hypolite Petovan 2019-08-18 09:16:25 -04:00 committed by GitHub
commit 77b754862b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -20,11 +20,12 @@ class Source extends BaseAdminModule
$a = self::getApp(); $a = self::getApp();
$guid = null; $guid = null;
if (!empty($a->argv[1])) { // @TODO: Replace with parameter from router
$guid = $a->argv[1]; if (!empty($a->argv[3])) {
$guid = $a->argv[3];
} }
$guid = defaults($_REQUEST['guid'], $guid); $guid = $_REQUEST['guid'] ?? $guid;
$source = ''; $source = '';
$item_uri = ''; $item_uri = '';