diff options
| author | redmatrix <git@macgirvin.com> | 2016-03-17 12:16:25 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-03-17 12:16:25 -0700 |
| commit | df61970b39c4d7e2fbdf031274792b41bd34a2d2 (patch) | |
| tree | e34ecef5f5d95365f11df76eba20cc53d55822de /include | |
| parent | f82afca84d19ba87cd911ec28638fb45a7f7e6f0 (diff) | |
| parent | eca119d695603680541a715d9d91d33f888653bb (diff) | |
| download | volse-hubzilla-df61970b39c4d7e2fbdf031274792b41bd34a2d2.tar.gz volse-hubzilla-df61970b39c4d7e2fbdf031274792b41bd34a2d2.tar.bz2 volse-hubzilla-df61970b39c4d7e2fbdf031274792b41bd34a2d2.zip | |
Merge https://github.com/redmatrix/hubzilla into pending_merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/identity.php | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/include/identity.php b/include/identity.php index 382b096fe..5d18d69e0 100644 --- a/include/identity.php +++ b/include/identity.php @@ -410,7 +410,15 @@ function create_identity($arr) { set_pconfig($ret['channel']['channel_id'],'system','photo_path', '%Y-%m'); set_pconfig($ret['channel']['channel_id'],'system','attach_path','%Y-%m'); } - + + // UNO: channel defaults, incl addons (addons specific pconfig will only work after the relevant addon is enabled by the admin). It's located here, so members can modify these defaults after the channel is created. + if(UNO) { + //diaspora protocol addon + set_pconfig($ret['channel']['channel_id'],'system','diaspora_allowed', '1'); + set_pconfig($ret['channel']['channel_id'],'system','diaspora_public_comments', '1'); + set_pconfig($ret['channel']['channel_id'],'system','prevent_tag_hijacking', '0'); + } + // auto-follow any of the hub's pre-configured channel choices. // Only do this if it's the first channel for this account; // otherwise it could get annoying. Don't make this list too big |