harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

issue with auto permissions

Browse Source
This commit is contained in:
friendica 2013-05-19 17:57:06 -07:00
parent 3e64208f48
commit f9fec7cf8f
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mod/connections.php
View File

@ -350,7 +350,15 @@ function connections_content(&$a) {
$unapproved = array('pending', t('Approve this connection'), '', t('Accept connection to allow communication')); $unapproved = array('pending', t('Approve this connection'), '', t('Accept connection to allow communication'));
foreach($global_perms as $k => $v) { foreach($global_perms as $k => $v) {
$perms[] = array('perms_' . $k, $v[3], (($contact['abook_their_perms'] & $v[1]) ? "1" : ""),((($contact['abook_my_perms'] & $v[1]) || $existing[$k]) ? "1" : ""), $v[1], (($channel[$v[0]] == PERMS_SPECIFIC) ? '' : '1'), $v[4]); $thisperm = (($contact['abook_my_perms'] & $v[1]) ? "1" : '');
// For auto permissions (when $self is true) we don't want to look at existing
// permissions because they are enabled for the channel owner
if((! $self) && ($existing[$k]))
$thisperm = "1";
$perms[] = array('perms_' . $k, $v[3], (($contact['abook_their_perms'] & $v[1]) ? "1" : ""),$thisperm, $v[1], (($channel[$v[0]] == PERMS_SPECIFIC) ? '' : '1'), $v[4]);
} }
$o .= replace_macros($tpl,array( $o .= replace_macros($tpl,array(

2
mod/editpost.php
View File

@ -83,7 +83,7 @@ function editpost_content(&$a) {
'$pvisit' => 'none', '$pvisit' => 'none',
'$public' => t('Public post'), '$public' => t('Public post'),
'$jotnets' => $jotnets, '$jotnets' => $jotnets,
'$title' => $itm[0]['title'], '$title' => htmlspecialchars($itm[0]['title']),
'$placeholdertitle' => t('Set title'), '$placeholdertitle' => t('Set title'),
'$category' => file_tag_file_to_list($itm[0]['file'], 'category'), '$category' => file_tag_file_to_list($itm[0]['file'], 'category'),
'$placeholdercategory' => t('Categories (comma-separated list)'), '$placeholdercategory' => t('Categories (comma-separated list)'),

2
version.inc
View File

@ -1 +1 @@
2013-05-18.317 2013-05-19.318