mirror of
https://git.friendi.ca/friendica/friendica-addons.git
synced 2025-06-07 09:54:27 +02:00
[various] Rename group to circle
- Drop support for group_text - Add support for circle_text
This commit is contained in:
parent
941b8c5a14
commit
aa0f74832a
45 changed files with 793 additions and 40 deletions
|
@ -18,7 +18,7 @@ use Friendica\Core\Worker;
|
|||
use Friendica\Database\DBA;
|
||||
use Friendica\DI;
|
||||
use Friendica\Model\Contact;
|
||||
use Friendica\Model\Group;
|
||||
use Friendica\Model\Circle;
|
||||
use Friendica\Model\Item;
|
||||
use Friendica\Model\Post;
|
||||
use Friendica\Model\User;
|
||||
|
@ -976,7 +976,7 @@ function pumpio_get_contact($uid, $contact, $no_insert = false)
|
|||
|
||||
$contact_id = $r['id'];
|
||||
|
||||
Group::addMember(User::getDefaultGroup($uid), $contact_id);
|
||||
Circle::addMember(User::getDefaultCircle($uid), $contact_id);
|
||||
} else {
|
||||
$contact_id = $r['id'];
|
||||
}
|
||||
|
@ -1353,8 +1353,8 @@ function pumpio_getreceiver(array $b)
|
|||
$gid = trim($gid, ' <>');
|
||||
|
||||
$contacts = DBA::p("SELECT `contact`.`name`, `contact`.`nick`, `contact`.`url`, `contact`.`network`
|
||||
FROM `group_member`, `contact` WHERE `group_member`.`gid` = ?
|
||||
AND `contact`.`id` = `group_member`.`contact-id` AND `contact`.`network` = ?",
|
||||
FROM `group_member` AS `circle_member`, `contact` WHERE `circle_member`.`gid` = ?
|
||||
AND `contact`.`id` = `circle_member`.`contact-id` AND `contact`.`network` = ?",
|
||||
$gid, Protocol::PUMPIO);
|
||||
|
||||
while ($row = DBA::fetch($contacts)) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue