aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-10-29 01:35:49 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-10-29 01:35:49 -0700
commitbb469deb850dacc16e26ceb65f2a215a72eb6caa (patch)
treeb22fc20a673cb501218a4455c5071d8851a0931d
parent96402a235482af73c9c958ad9b1cf629d0bfb8cb (diff)
downloadvolse-hubzilla-bb469deb850dacc16e26ceb65f2a215a72eb6caa.tar.gz
volse-hubzilla-bb469deb850dacc16e26ceb65f2a215a72eb6caa.tar.bz2
volse-hubzilla-bb469deb850dacc16e26ceb65f2a215a72eb6caa.zip
add entry for 'none'
-rw-r--r--mod/connedit.php22
1 files changed, 12 insertions, 10 deletions
diff --git a/mod/connedit.php b/mod/connedit.php
index d2b86ff86..c3fcc6d54 100644
--- a/mod/connedit.php
+++ b/mod/connedit.php
@@ -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);
}
- $locstr = '';
+ $locstr = '';
- $locs = q("select hubloc_addr as location from hubloc where hubloc_hash = '%s'",
- dbesc($contact['xchan_hash'])
- );
+ $locs = q("select hubloc_addr as location from hubloc where hubloc_hash = '%s'",
+ dbesc($contact['xchan_hash'])
+ );
- if($locs) {
- foreach($locs as $l) {
- if(strlen($locstr))
- $locstr .= ', ';
- $locstr .= $l['location'];
- }
+ if($locs) {
+ foreach($locs as $l) {
+ if(strlen($locstr))
+ $locstr .= ', ';
+ $locstr .= $l['location'];
}
+ }
+ else
+ $locstr = t('none');
$o .= replace_macros($tpl,array(