diff options
| author | friendica <info@friendica.com> | 2013-09-26 16:25:28 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-09-26 16:25:28 -0700 |
| commit | edc5566f79c94f7ad994eccc7a8bb0e586961cf4 (patch) | |
| tree | 2700d1f415e550a9f2aad009cd0a5eafd1ec9f2e /include | |
| parent | 6519433301a571d8e12ffa24b56534bb2e3afe5f (diff) | |
| download | volse-hubzilla-edc5566f79c94f7ad994eccc7a8bb0e586961cf4.tar.gz volse-hubzilla-edc5566f79c94f7ad994eccc7a8bb0e586961cf4.tar.bz2 volse-hubzilla-edc5566f79c94f7ad994eccc7a8bb0e586961cf4.zip | |
structure for channel unions
Diffstat (limited to 'include')
| -rw-r--r-- | include/identity.php | 2 | ||||
| -rw-r--r-- | include/zot.php | 3 |
2 files changed, 3 insertions, 2 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/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) ); } |