diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-01-22 06:37:30 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-01-22 06:37:30 +0100 |
| commit | b0d5b9fd2c5d5f8eb5a58b36f62dc20d6fa214b3 (patch) | |
| tree | 57247808f666c2dfe689f09f0b35a0d95d958e68 /include | |
| parent | fb1e6ca6c17dc24cfe29bde375f933822117a9af (diff) | |
| parent | 75468c255a5fcb7d78a95e6c865d4d503efbfbfc (diff) | |
| download | volse-hubzilla-b0d5b9fd2c5d5f8eb5a58b36f62dc20d6fa214b3.tar.gz volse-hubzilla-b0d5b9fd2c5d5f8eb5a58b36f62dc20d6fa214b3.tar.bz2 volse-hubzilla-b0d5b9fd2c5d5f8eb5a58b36f62dc20d6fa214b3.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include')
| -rw-r--r-- | include/permissions.php | 4 | ||||
| -rw-r--r-- | include/text.php | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/permissions.php b/include/permissions.php index a8e761f87..8071af686 100644 --- a/include/permissions.php +++ b/include/permissions.php @@ -641,10 +641,10 @@ function get_role_perms($role) { $ret['directory_publish'] = true; $ret['online'] = false; $ret['perms_follow'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_ABOOK - |PERMS_W_STREAM|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT + |PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT |PERMS_R_STORAGE|PERMS_R_PAGES|PERMS_A_REPUBLISH|PERMS_W_LIKE|PERMS_W_TAGWALL; $ret['perms_accept'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_ABOOK - |PERMS_W_STREAM|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT + |PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT |PERMS_R_STORAGE|PERMS_R_PAGES|PERMS_A_REPUBLISH|PERMS_W_LIKE|PERMS_W_TAGWALL; $ret['channel_r_stream'] = PERMS_PUBLIC; $ret['channel_r_profile'] = PERMS_PUBLIC; diff --git a/include/text.php b/include/text.php index a03648081..0b5ad9c72 100644 --- a/include/text.php +++ b/include/text.php @@ -2716,5 +2716,7 @@ function item_url_replace($channel,&$item,$old,$new) { $item['sig'] = base64url_encode(rsa_sign($item['body'],$channel['channel_prvkey'])); $item['item_verified'] = 1; } + + // @fixme item['plink'] and item['llink'] } |