aboutsummaryrefslogtreecommitdiffstats
path: root/include/ItemObject.php
diff options
context:
space:
mode:
authorChristian Vogeley <christian.vogeley@hotmail.de>2013-08-21 22:19:38 +0200
committerChristian Vogeley <christian.vogeley@hotmail.de>2013-08-21 22:19:38 +0200
commit056ed00a4cea6175eb57781569a77648ce7d3382 (patch)
tree5b5a4f3469bb8fb6b3d3368795ed60d8a6441682 /include/ItemObject.php
parenta944a879b1e6ebd8b3d278b86ea4404ba5b7aa81 (diff)
parentd8ef1417fb2ff8d736e4392c118c51c63dc66b1d (diff)
downloadvolse-hubzilla-056ed00a4cea6175eb57781569a77648ce7d3382.tar.gz
volse-hubzilla-056ed00a4cea6175eb57781569a77648ce7d3382.tar.bz2
volse-hubzilla-056ed00a4cea6175eb57781569a77648ce7d3382.zip
Merge remote-tracking branch 'upstream/master'
Update
Diffstat (limited to 'include/ItemObject.php')
-rw-r--r--include/ItemObject.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/ItemObject.php b/include/ItemObject.php
index 8c8c0ee2a..22b191e79 100644
--- a/include/ItemObject.php
+++ b/include/ItemObject.php
@@ -39,10 +39,10 @@ class Item extends BaseObject {
foreach($data['children'] as $item) {
/*
- * Only add thos that will be displayed
+ * Only add those that will be displayed
*/
- if(! visible_activity($item)) {
+ if((! visible_activity($item)) || array_key_exists('author_blocked',$item)) {
continue;
}