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 | |
| 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')
| -rw-r--r-- | include/identity.php | 2 | ||||
| -rwxr-xr-x | include/items.php | 6 | ||||
| -rw-r--r-- | include/zot.php | 3 |
3 files changed, 8 insertions, 3 deletions
diff --git a/include/identity.php b/include/identity.php index 98209c8ae..d6b6735f6 100644 --- a/include/identity.php +++ b/include/identity.php @@ -48,7 +48,7 @@ function validate_channelname($name) { function create_dir_account() { - create_account(array( + create_identity(array( 'account_id' => 'xxx', // This will create an identity with an (integer) account_id of 0, but account_id is required 'nickname' => 'dir', 'name' => 'Directory', diff --git a/include/items.php b/include/items.php index 4aecf9174..25bcf0253 100755 --- a/include/items.php +++ b/include/items.php @@ -98,6 +98,10 @@ function can_comment_on_post($observer_xchan,$item) { return true; break; case 'public': + # We don't allow public comments yet, until a policy + # for dealing with anonymous comments is in place with + # a means to moderate comments. Until that time, return + # false. return false; break; case 'contacts': @@ -3874,4 +3878,4 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C } return $items; -}
\ No newline at end of file +} 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) ); } |