Merge pull request #6559 from tobiasd/20190130-admininiwarning

[friendica.git] / mod / community.php

diff --git a/mod/community.php b/mod/community.php
index a85a79c05106a4dc54e8dcde1b6e032b7374bcc5..3c621f4261accf229c4230020a9b5d8832597847 100644 (file)
--- a/mod/community.php
+++ b/mod/community.php
@@ -14,6 +14,7 @@ use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
+use Friendica\Model\User;
 
 function community_init(App $a)
 {
@@ -44,16 +45,16 @@ function community_content(App $a, $update = 0)
        if ($a->argc > 2) {
                switch ($a->argv[2]) {
                        case 'person':
-                               $accounttype = Contact::ACCOUNT_TYPE_PERSON;
+                               $accounttype = User::ACCOUNT_TYPE_PERSON;
                                break;
                        case 'organisation':
-                               $accounttype = Contact::ACCOUNT_TYPE_ORGANISATION;
+                               $accounttype = User::ACCOUNT_TYPE_ORGANISATION;
                                break;
                        case 'news':
-                               $accounttype = Contact::ACCOUNT_TYPE_NEWS;
+                               $accounttype = User::ACCOUNT_TYPE_NEWS;
                                break;
                        case 'community':
-                               $accounttype = Contact::ACCOUNT_TYPE_COMMUNITY;
+                               $accounttype = User::ACCOUNT_TYPE_COMMUNITY;
                                break;
                }
        }
@@ -93,8 +94,6 @@ function community_content(App $a, $update = 0)
                }
        }
 
-       require_once 'include/conversation.php';
-
        if (!$update) {
                $tabs = [];
 
@@ -120,7 +119,7 @@ function community_content(App $a, $update = 0)
                        ];
                }
 
-               $tab_tpl = get_markup_template('common_tabs.tpl');
+               $tab_tpl = Renderer::getMarkupTemplate('common_tabs.tpl');
                $o .= Renderer::replaceMacros($tab_tpl, ['$tabs' => $tabs]);
 
                Nav::setSelected('community');
@@ -199,7 +198,7 @@ function community_content(App $a, $update = 0)
                $o .= $pager->renderMinimal(count($r));
        }
 
-       $t = get_markup_template("community.tpl");
+       $t = Renderer::getMarkupTemplate("community.tpl");
        return Renderer::replaceMacros($t, [
                '$content' => $o,
                '$header' => '',