mirror of
https://github.com/friendica/friendica
synced 2025-05-11 06:24:11 +02:00
Replace "group" with "circle" in the rest of the code
- Remaining mentions already mean "forum"
This commit is contained in:
parent
4f6e02357a
commit
4f7740264e
120 changed files with 1308 additions and 1304 deletions
|
@ -263,12 +263,12 @@ class UserExport extends BaseSettings
|
|||
sprintf("SELECT * FROM `pconfig` WHERE uid = %d", $user_id)
|
||||
);
|
||||
|
||||
$group = $this->exportMultiRow(
|
||||
$circle = $this->exportMultiRow(
|
||||
sprintf("SELECT * FROM `group` WHERE uid = %d", $user_id)
|
||||
);
|
||||
|
||||
$group_member = $this->exportMultiRow(
|
||||
sprintf("SELECT `group_member`.`gid`, `group_member`.`contact-id` FROM `group_member` INNER JOIN `group` ON `group`.`id` = `group_member`.`gid` WHERE `group`.`uid` = %d", $user_id)
|
||||
$circle_member = $this->exportMultiRow(
|
||||
sprintf("SELECT `circle_member`.`gid`, `circle_member`.`contact-id` FROM `group_member` AS `circle_member` INNER JOIN `group` AS `circle` ON `circle`.`id` = `circle_member`.`gid` WHERE `circle`.`uid` = %d", $user_id)
|
||||
);
|
||||
|
||||
$output = [
|
||||
|
@ -281,8 +281,8 @@ class UserExport extends BaseSettings
|
|||
'profile_fields' => $profile_fields,
|
||||
'photo' => $photo,
|
||||
'pconfig' => $pconfig,
|
||||
'group' => $group,
|
||||
'group_member' => $group_member,
|
||||
'circle' => $circle,
|
||||
'circle_member' => $circle_member,
|
||||
];
|
||||
|
||||
echo json_encode($output, JSON_PARTIAL_OUTPUT_ON_ERROR);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue