structure for channel unions

This commit is contained in:
friendica
2013-09-26 16:25:28 -07:00
parent 6519433301
commit edc5566f79
7 changed files with 34 additions and 10 deletions

View File

@@ -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',

View File

@@ -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)
);
}