Replace deprecated Addon::callHooks with Hook::callAll

[friendica.git] / mod / network.php

diff --git a/mod/network.php b/mod/network.php
index 6a4413b54e88d355ca5977d223f934a6b141cd03..015be2b17cb33b1132b2ead19907a0213bc66c92 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -12,7 +12,6 @@ use Friendica\Content\Pager;
 use Friendica\Content\Widget;
 use Friendica\Content\Text\HTML;
 use Friendica\Core\ACL;
-use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
@@ -30,9 +29,6 @@ use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Strings;
 
-require_once 'include/conversation.php';
-require_once 'include/items.php';
-
 function network_init(App $a)
 {
        if (!local_user()) {
@@ -358,7 +354,7 @@ function network_content(App $a, $update = 0, $parent = 0)
 
        /// @TODO Is this really necessary? $a is already available to hooks
        $arr = ['query' => $a->query_string];
-       Addon::callHooks('network_content_init', $arr);
+       Hook::callAll('network_content_init', $arr);
 
        $flat_mode = false;
 
@@ -628,7 +624,7 @@ function networkThreadedView(App $a, $update, $parent)
                $group = DBA::selectFirst('group', ['name'], ['id' => $gid, 'uid' => local_user()]);
                if (!DBA::isResult($group)) {
                        if ($update) {
-                               killme();
+                               exit();
                        }
                        notice(L10n::t('No such group') . EOL);
                        $a->internalRedirect('network/0');
@@ -1027,7 +1023,7 @@ function network_tabs(App $a)
        }
 
        $arr = ['tabs' => $tabs];
-       Addon::callHooks('network_tabs', $arr);
+       Hook::callAll('network_tabs', $arr);
 
        $tpl = Renderer::getMarkupTemplate('common_tabs.tpl');