diff options
author | Thomas Willingham <founder@kakste.com> | 2013-09-27 02:45:16 +0100 |
---|---|---|
committer | Thomas Willingham <founder@kakste.com> | 2013-09-27 02:45:16 +0100 |
commit | 8d92d21135aeadb9a2bf498a8697d2d3694abcd1 (patch) | |
tree | 9cf5ad40d036b09f30aacc66f3627b25a28cbfd8 /include/zot.php | |
parent | d6607f2093414afd3cbba58021a92b01d3c356fd (diff) | |
parent | 8e94e79c7bfc4253efb17f32246bdafd498a3aed (diff) | |
download | volse-hubzilla-8d92d21135aeadb9a2bf498a8697d2d3694abcd1.tar.gz volse-hubzilla-8d92d21135aeadb9a2bf498a8697d2d3694abcd1.tar.bz2 volse-hubzilla-8d92d21135aeadb9a2bf498a8697d2d3694abcd1.zip |
Merge branch 'master' of https://github.com/friendica/red
Diffstat (limited to 'include/zot.php')
-rw-r--r-- | include/zot.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/zot.php b/include/zot.php index 0290bc402..0658f1738 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1422,9 +1422,10 @@ function import_directory_profile($hash,$profile,$addr,$ud_flags = 1, $suppress_ // Self censored, make it so // These are not translated, so the German "erwachsenen" keyword will not censor the directory profile. Only the English form - "adult". + if(in_arrayi('nsfw',$clean) || in_arrayi('adult',$clean)) { q("update xchan set xchan_flags = (xchan_flags | %d) where xchan_hash = '%s' limit 1", - intval(XCHAN_FLAGS_CENSORED), + intval(XCHAN_FLAGS_SELFCENSORED), dbesc($hash) ); } |