Cleaning confirm

[friendica.git] / mod / community.php

diff --git a/mod/community.php b/mod/community.php
index 1017698eaa5c134f5f5f24115f4f9f68070f8fc1..79f3ae9c3ae64a3a2ee96535ba9807a60b8e9ea6 100644 (file)
--- a/mod/community.php
+++ b/mod/community.php
@@ -10,9 +10,11 @@ use Friendica\Core\ACL;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
+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)
 {
@@ -43,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;
                }
        }
@@ -92,8 +94,6 @@ function community_content(App $a, $update = 0)
                }
        }
 
-       require_once 'include/conversation.php';
-
        if (!$update) {
                $tabs = [];
 
@@ -119,8 +119,8 @@ function community_content(App $a, $update = 0)
                        ];
                }
 
-               $tab_tpl = get_markup_template('common_tabs.tpl');
-               $o .= replace_macros($tab_tpl, ['$tabs' => $tabs]);
+               $tab_tpl = Renderer::getMarkupTemplate('common_tabs.tpl');
+               $o .= Renderer::replaceMacros($tab_tpl, ['$tabs' => $tabs]);
 
                Nav::setSelected('community');
 
@@ -198,8 +198,8 @@ function community_content(App $a, $update = 0)
                $o .= $pager->renderMinimal(count($r));
        }
 
-       $t = get_markup_template("community.tpl");
-       return replace_macros($t, [
+       $t = Renderer::getMarkupTemplate("community.tpl");
+       return Renderer::replaceMacros($t, [
                '$content' => $o,
                '$header' => '',
                '$show_global_community_hint' => ($content == 'global') && Config::get('system', 'show_global_community_hint'),
@@ -219,9 +219,9 @@ function community_getitems($start, $itemspage, $content, $accounttype)
                }
 
                $r = DBA::p("SELECT `item`.`uri`, `author`.`url` AS `author-link` FROM `thread`
-                       INNER JOIN `user` ON `user`.`uid` = `thread`.`uid` AND NOT `user`.`hidewall`
-                       INNER JOIN `item` ON `item`.`id` = `thread`.`iid`
-                       INNER JOIN `contact` AS `author` ON `author`.`id`=`item`.`author-id`
+                       STRAIGHT_JOIN `user` ON `user`.`uid` = `thread`.`uid` AND NOT `user`.`hidewall`
+                       STRAIGHT_JOIN `item` ON `item`.`id` = `thread`.`iid`
+                       STRAIGHT_JOIN `contact` AS `author` ON `author`.`id`=`item`.`author-id`
                        WHERE `thread`.`visible` AND NOT `thread`.`deleted` AND NOT `thread`.`moderated`
                        AND NOT `thread`.`private` AND `thread`.`wall` AND `thread`.`origin` $sql_accounttype
                        ORDER BY `thread`.`commented` DESC LIMIT ?, ?", $values);