Fix undefined variable/wrong parameter count/unknown functions

[friendica.git] / src / Worker / Notifier.php

diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php
index 18fff2afda1c50f493811b8b83b870e1c127636c..e3eb6810a3c418915a0d57e5c5ee3ad038cfd80f 100644 (file)
--- a/src/Worker/Notifier.php
+++ b/src/Worker/Notifier.php
@@ -8,12 +8,14 @@ use Friendica\Core\Config;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
+use Friendica\Model\Group;
 use Friendica\Network\Probe;
 use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\OStatus;
 use Friendica\Protocol\Salmon;
 use dba;
 
+require_once 'include/dba.php';
 require_once 'include/queue_fn.php';
 require_once 'include/html2plain.php';
 require_once 'include/datetime.php';
@@ -207,8 +209,6 @@ class Notifier {
 
                        $slap = OStatus::salmon($target_item, $owner);
 
-                       require_once 'include/group.php';
-
                        $parent = $items[0];
 
                        $thr_parent = q("SELECT `network`, `author-link`, `owner-link` FROM `item` WHERE `uri` = '%s' AND `uid` = %d",
@@ -349,9 +349,9 @@ class Notifier {
                                }
 
                                $allow_people = expand_acl($parent['allow_cid']);
-                               $allow_groups = expand_groups(expand_acl($parent['allow_gid']),true);
+                               $allow_groups = Group::expand(expand_acl($parent['allow_gid']),true);
                                $deny_people  = expand_acl($parent['deny_cid']);
-                               $deny_groups  = expand_groups(expand_acl($parent['deny_gid']));
+                               $deny_groups  = Group::expand(expand_acl($parent['deny_gid']));
 
                                // if our parent is a public forum (forum_mode == 1), uplink to the origional author causing
                                // a delivery fork. private groups (forum_mode == 2) do not uplink