Merge pull request #8086 from annando/delegations
Fix: Show possible managers again
This commit is contained in:
commit
a7774f6f5e
|
@ -102,21 +102,12 @@ class Delegation extends BaseSettingsModule
|
|||
|
||||
// find every contact who might be a candidate for delegation
|
||||
$potentials = [];
|
||||
|
||||
$contacts = DBA::selectToArray(
|
||||
'contact',
|
||||
['nurl'],
|
||||
[
|
||||
"`self` = 0 AND SUBSTRING_INDEX(`nurl`, '/', 3) = ? AND `uid` = ? AND `network` = ?",
|
||||
Strings::normaliseLink(DI::baseUrl()),
|
||||
local_user(),
|
||||
Protocol::DFRN,
|
||||
]
|
||||
);
|
||||
if ($contacts) {
|
||||
$nicknames = [];
|
||||
foreach ($contacts as $contact) {
|
||||
$nicknames[] = "'" . DBA::escape(basename($contact['nurl'])) . "'";
|
||||
|
||||
$condition = ['baseurl' => DI::baseUrl(), 'self' => false, 'uid' => local_user(), 'blocked' => false];
|
||||
$contacts = DBA::select('contact', ['nick'], $condition);
|
||||
while ($contact = DBA::fetch($contacts)) {
|
||||
$nicknames[] = $contact['nick'];
|
||||
}
|
||||
|
||||
// get user records for all potential page delegates who are not already delegates or managers
|
||||
|
@ -126,7 +117,6 @@ class Delegation extends BaseSettingsModule
|
|||
$potentials[] = $user;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$parent_user = null;
|
||||
$parent_password = null;
|
||||
|
|
Loading…
Reference in a new issue