Merge pull request #3613 from annando/some-ostatus

[friendica.git] / mod / community.php

diff --git a/mod/community.php b/mod/community.php
index 45326e291d01236b304b53e5614cefe8591e2778..89a369d94f2577a47332b2cead1247559edc31d2 100644 (file)
--- a/mod/community.php
+++ b/mod/community.php
@@ -1,6 +1,7 @@
 <?php
 
-use \Friendica\Core\Config;
+use Friendica\App;
+use Friendica\Core\Config;
 
 function community_init(App $a) {
        if (! local_user()) {
@@ -9,7 +10,6 @@ function community_init(App $a) {
        }
 }
 
-
 function community_content(App $a, $update = 0) {
 
        $o = '';
@@ -68,14 +68,14 @@ function community_content(App $a, $update = 0) {
                                }
                                $previousauthor = $item["author-link"];
 
-                               if (($numposts < $maxpostperauthor) AND (sizeof($s) < $a->pager['itemspage'])) {
+                               if (($numposts < $maxpostperauthor) && (sizeof($s) < $a->pager['itemspage'])) {
                                        $s[] = $item;
                                }
                        }
                        if ((sizeof($s) < $a->pager['itemspage'])) {
                                $r = community_getitems($a->pager['start'] + ($count * $a->pager['itemspage']), $a->pager['itemspage']);
                        }
-               } while ((sizeof($s) < $a->pager['itemspage']) AND (++$count < 50) AND (sizeof($r) > 0));
+               } while ((sizeof($s) < $a->pager['itemspage']) && (++$count < 50) && (sizeof($r) > 0));
        } else {
                $s = $r;
        }
@@ -115,10 +115,10 @@ function community_getpublicitems($start, $itemspage) {
        $r = qu("SELECT %s
                FROM `thread`
                INNER JOIN `item` ON `item`.`id` = `thread`.`iid` %s
-               WHERE `thread`.`uid` = 0
+               WHERE `thread`.`uid` = 0 AND `verb` = '%s'
                ORDER BY `thread`.`created` DESC LIMIT %d, %d",
                item_fieldlists(), item_joins(),
-               intval($start), intval($itemspage)
+               dbesc(ACTIVITY_POST), intval($start), intval($itemspage)
        );
 
        return($r);