aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Willingham <beardyunixer@beardyunixer.com>2014-12-10 15:34:18 +0000
committerThomas Willingham <beardyunixer@beardyunixer.com>2014-12-10 15:34:18 +0000
commitad2c8a4cb76d727cc6c22fb42f87ffa1fd32edb3 (patch)
treef546c71de9b0b98235a6a49eeb073ec4ab5f94c1
parenta23af1f5f7dc4b256b56f05ce27841eb13e1cb4f (diff)
downloadvolse-hubzilla-ad2c8a4cb76d727cc6c22fb42f87ffa1fd32edb3.tar.gz
volse-hubzilla-ad2c8a4cb76d727cc6c22fb42f87ffa1fd32edb3.tar.bz2
volse-hubzilla-ad2c8a4cb76d727cc6c22fb42f87ffa1fd32edb3.zip
Provide censorship.
-rw-r--r--include/conversation.php13
1 files changed, 9 insertions, 4 deletions
diff --git a/include/conversation.php b/include/conversation.php
index d0cd81c4a..b9419acde 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -431,13 +431,18 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $
$arr_blocked = null;
- if(local_user()) {
+ if(local_user())
$str_blocked = get_pconfig(local_user(),'system','blocked');
- if($str_blocked) {
+ if(! local_user() && ($mode == 'network')) {
+ $sys = get_sys_channel();
+ $id = $sys['channel_id'];
+ $str_blocked = get_pconfig($id,'system','blocked');
+ }
+
+ if($str_blocked) {
$arr_blocked = explode(',',$str_blocked);
for($x = 0; $x < count($arr_blocked); $x ++)
- $arr_blocked[$x] = trim($arr_blocked[$x]);
- }
+ $arr_blocked[$x] = trim($arr_blocked[$x]);
}