mirror of
https://github.com/friendica/friendica
synced 2025-04-23 22:30:10 +00:00
Merge
This commit is contained in:
parent
c2a9b3b9e9
commit
70e5639e29
17 changed files with 34 additions and 7 deletions
|
@ -102,6 +102,7 @@ class DBSync extends BaseAdmin
|
|||
$failed[] = $upd;
|
||||
}
|
||||
}
|
||||
DBA::close($configStmt);
|
||||
|
||||
if (!count($failed)) {
|
||||
$o = Renderer::replaceMacros(Renderer::getMarkupTemplate('admin/dbsync/structure_check.tpl'), [
|
||||
|
|
|
@ -121,6 +121,7 @@ class Site extends BaseAdmin
|
|||
while ($user = DBA::fetch($usersStmt)) {
|
||||
Worker::add(PRIORITY_HIGH, 'Notifier', Delivery::RELOCATION, $user['uid']);
|
||||
}
|
||||
DBA::close($usersStmt);
|
||||
|
||||
info("Relocation started. Could take a while to complete.");
|
||||
|
||||
|
|
|
@ -125,6 +125,7 @@ class Delegation extends BaseSettings
|
|||
while ($contact = DBA::fetch($contacts)) {
|
||||
$nicknames[] = $contact['nick'];
|
||||
}
|
||||
DBA::close($contacts);
|
||||
|
||||
// get user records for all potential page delegates who are not already delegates or managers
|
||||
$potentialDelegateUsers = DBA::selectToArray('user', ['uid', 'username', 'nickname'], ['nickname' => $nicknames]);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue