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

add entry for 'none'

Browse Source
This commit is contained in:
redmatrix 2015-10-29 01:35:49 -07:00
parent 96402a2354
commit bb469deb85
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mod/connedit.php
View File

@ -652,19 +652,21 @@ function connedit_content(&$a) {
$perms[] = array('perms_' . $k, $v[3], (($contact['abook_their_perms'] & $v[1]) ? "1" : ""),$thisperm, $v[1], (($channel[$v[0]] == PERMS_SPECIFIC) ? '' : '1'), $v[4], $checkinherited); $perms[] = array('perms_' . $k, $v[3], (($contact['abook_their_perms'] & $v[1]) ? "1" : ""),$thisperm, $v[1], (($channel[$v[0]] == PERMS_SPECIFIC) ? '' : '1'), $v[4], $checkinherited);
} }
$locstr = ''; $locstr = '';
$locs = q("select hubloc_addr as location from hubloc where hubloc_hash = '%s'", $locs = q("select hubloc_addr as location from hubloc where hubloc_hash = '%s'",
dbesc($contact['xchan_hash']) dbesc($contact['xchan_hash'])
); );
if($locs) { if($locs) {
foreach($locs as $l) { foreach($locs as $l) {
if(strlen($locstr)) if(strlen($locstr))
$locstr .= ', '; $locstr .= ', ';
$locstr .= $l['location']; $locstr .= $l['location'];
}
} }
}
else
$locstr = t('none');
$o .= replace_macros($tpl,array( $o .= replace_macros($tpl,array(