bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Merge pull request #5935 from MrPetovan/bug/5934-class-group-not-found

Browse source 
Fix namespace usage in mod/group
This commit is contained in:
Hypolite Petovan 2018-10-15 18:36:32 -04:00 committed by GitHub
commit c4cb396730
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
mod/group.php
View file

@ -16,7 +16,7 @@ use Friendica\Module;
function group_init(App $a) { function group_init(App $a) {
if (local_user()) { if (local_user()) {
$a->page['aside'] = Group::sidebarWidget('contacts', 'group', 'extended', (($a->argc > 1) ? $a->argv[1] : 'everyone')); $a->page['aside'] = Model\Group::sidebarWidget('contacts', 'group', 'extended', (($a->argc > 1) ? $a->argv[1] : 'everyone'));
} }
} }
@ -31,10 +31,10 @@ function group_post(App $a) {
check_form_security_token_redirectOnErr('/group/new', 'group_edit'); check_form_security_token_redirectOnErr('/group/new', 'group_edit');
$name = notags(trim($_POST['groupname'])); $name = notags(trim($_POST['groupname']));
$r = Group::create(local_user(), $name); $r = Model\Group::create(local_user(), $name);
if ($r) { if ($r) {
info(L10n::t('Group created.') . EOL); info(L10n::t('Group created.') . EOL);
$r = Group::getIdByName(local_user(), $name); $r = Model\Group::getIdByName(local_user(), $name);
if ($r) { if ($r) {
goaway(System::baseUrl() . '/group/' . $r); goaway(System::baseUrl() . '/group/' . $r);
} }
@ -71,7 +71,7 @@ function group_post(App $a) {
} }
} }
$a->page['aside'] = Group::sidebarWidget(); $a->page['aside'] = Model\Group::sidebarWidget();
} }
return; return;
} }
@ -148,7 +148,7 @@ function group_content(App $a) {
$result = null; $result = null;
if (DBA::isResult($r)) { if (DBA::isResult($r)) {
$result = Group::removeByName(local_user(), $r[0]['name']); $result = Model\Group::removeByName(local_user(), $r[0]['name']);
} }
if ($result) { if ($result) {
@ -198,9 +198,9 @@ function group_content(App $a) {
if ($change) { if ($change) {
if (in_array($change, $preselected)) { if (in_array($change, $preselected)) {
Group::removeMember($group['id'], $change); Model\Group::removeMember($group['id'], $change);
} else { } else {
Group::addMember($group['id'], $change); Model\Group::addMember($group['id'], $change);
} }
$members = Model\Contact::getByGroupId($group['id']); $members = Model\Contact::getByGroupId($group['id']);
@ -261,7 +261,7 @@ function group_content(App $a) {
$groupeditor['members'][] = $entry; $groupeditor['members'][] = $entry;
} else { } else {
Group::removeMember($group['id'], $member['id']); Model\Group::removeMember($group['id'], $member['id']);
} }
} }