diff options
| author | redmatrix <git@macgirvin.com> | 2016-02-19 13:36:48 -0800 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-02-19 13:36:48 -0800 |
| commit | ebc66d7008adcfb104430ae527609df5da74188d (patch) | |
| tree | a8d661e86fb26dc6e376d79e1add43e920a21ae0 /include | |
| parent | 3f0eb84ecf8bfa373c98874ee8ba9ceb63ba5d1e (diff) | |
| parent | fbc6c60805d733e16a3ff7fdf60f564ce69fab64 (diff) | |
| download | volse-hubzilla-ebc66d7008adcfb104430ae527609df5da74188d.tar.gz volse-hubzilla-ebc66d7008adcfb104430ae527609df5da74188d.tar.bz2 volse-hubzilla-ebc66d7008adcfb104430ae527609df5da74188d.zip | |
Merge https://github.com/redmatrix/hubzilla into pending_merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/identity.php | 2 | ||||
| -rw-r--r-- | include/permissions.php | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/identity.php b/include/identity.php index 717deca14..a389a613e 100644 --- a/include/identity.php +++ b/include/identity.php @@ -1847,4 +1847,4 @@ function get_zcard($channel,$observer_hash = '',$args = array()) { return $o; -}
\ No newline at end of file +} diff --git a/include/permissions.php b/include/permissions.php index 8c36f9744..e4cd9ddda 100644 --- a/include/permissions.php +++ b/include/permissions.php @@ -864,10 +864,10 @@ function get_role_perms($role) { */ function get_roles() { $roles = array( - t('Social Networking') => array('social' => t('Mostly Public'), 'social_restricted' => t('Restricted'), 'social_private' => t('Private')), - t('Community Forum') => array('forum' => t('Mostly Public'), 'forum_restricted' => t('Restricted'), 'forum_private' => t('Private')), - t('Feed Republish') => array('feed' => t('Mostly Public'), 'feed_restricted' => t('Restricted')), - t('Special Purpose') => array('soapbox' => t('Celebrity/Soapbox'), 'repository' => t('Group Repository')), + t('Social Networking') => array('social' => t('Social - Mostly Public'), 'social_restricted' => t('Social - Restricted'), 'social_private' => t('Social - Private')), + t('Community Forum') => array('forum' => t('Forum - Mostly Public'), 'forum_restricted' => t('Forum - Restricted'), 'forum_private' => t('Forum - Private')), + t('Feed Republish') => array('feed' => t('Feed - Mostly Public'), 'feed_restricted' => t('Feed - Restricted')), + t('Special Purpose') => array('soapbox' => t('Special - Celebrity/Soapbox'), 'repository' => t('Special - Group Repository')), t('Other') => array('custom' => t('Custom/Expert Mode')) ); |