aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Widget
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-06-02 22:39:36 +0200
committerMario Vavti <mario@mariovavti.com>2018-06-02 22:39:36 +0200
commit3a9f149c803fa237a0412728f9e6f92e3b28bb04 (patch)
treec3c5da791342c4575208e24a24271e1e01d0cf6b /Zotlabs/Widget
parenta0e4f7ddb17088a704e4cf7dff2fcba35f1cc128 (diff)
parent5f612521da11cd4b9245909bf0a99a7431272e93 (diff)
downloadvolse-hubzilla-3a9f149c803fa237a0412728f9e6f92e3b28bb04.tar.gz
volse-hubzilla-3a9f149c803fa237a0412728f9e6f92e3b28bb04.tar.bz2
volse-hubzilla-3a9f149c803fa237a0412728f9e6f92e3b28bb04.zip
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'Zotlabs/Widget')
-rw-r--r--Zotlabs/Widget/Activity_filter.php2
-rw-r--r--Zotlabs/Widget/Forums.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Widget/Activity_filter.php b/Zotlabs/Widget/Activity_filter.php
index 6a1ad6f0a..f9993759c 100644
--- a/Zotlabs/Widget/Activity_filter.php
+++ b/Zotlabs/Widget/Activity_filter.php
@@ -102,7 +102,7 @@ class Activity_filter {
'icon' => 'folder',
'url' => '#',
'sel' => (($filter_active == 'file') ? true : false),
- 'title' => sprintf(t('Show posts that i have filed to %s'), $t['term']),
+ 'title' => sprintf(t('Show posts that I have filed to %s'), $t['term']),
'sub' => $tsub
];
diff --git a/Zotlabs/Widget/Forums.php b/Zotlabs/Widget/Forums.php
index 7415c0f0a..d3e2f2534 100644
--- a/Zotlabs/Widget/Forums.php
+++ b/Zotlabs/Widget/Forums.php
@@ -51,7 +51,7 @@ class Forums {
- $r1 = q("select abook_id, xchan_hash, xchan_name, xchan_url, xchan_photo_s from abook left join xchan on abook_xchan = xchan_hash where xchan_deleted = 0 and abook_channel = %d and abook_pending = 0 and abook_ignored = 0 and abook_blocked = 0 $sql_extra order by xchan_name $limit ",
+ $r1 = q("select abook_id, xchan_hash, xchan_name, xchan_url, xchan_photo_s from abook left join xchan on abook_xchan = xchan_hash where xchan_deleted = 0 and abook_channel = %d and abook_pending = 0 and abook_ignored = 0 and abook_blocked = 0 and abook_archived = 0 $sql_extra order by xchan_name $limit ",
intval(local_channel())
);