aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-06-29 18:01:51 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-06-29 18:01:51 -0700
commit6e8ad5089e3aeea6377718db91ccf48284a315fa (patch)
tree41cfeac8c0e80a135bdb10e9631519b8b2dd3225 /mod
parent63f2e9b41259975f1af6415cda01dc0f81b1af30 (diff)
parent2072ea721fa26b8e5f7dd4067434951b738de92b (diff)
downloadvolse-hubzilla-6e8ad5089e3aeea6377718db91ccf48284a315fa.tar.gz
volse-hubzilla-6e8ad5089e3aeea6377718db91ccf48284a315fa.tar.bz2
volse-hubzilla-6e8ad5089e3aeea6377718db91ccf48284a315fa.zip
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts: view/nl/messages.po view/nl/strings.php
Diffstat (limited to 'mod')
-rw-r--r--mod/directory.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/mod/directory.php b/mod/directory.php
index 5220c1e3e..f01efc053 100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -210,7 +210,7 @@ function directory_content(&$a) {
$location .= $rr['region'];
}
if(strlen($rr['country'])) {
- if(strlen($details))
+ if(strlen($location))
$location .= ', ';
$location .= $rr['country'];
}
@@ -286,7 +286,6 @@ function directory_content(&$a) {
'hash' => $rr['hash'],
'alttext' => $rr['name'] . ((local_channel() || remote_channel()) ? ' ' . $rr['address'] : ''),
'name' => $rr['name'],
- 'details' => $details,
'age' => $age,
'age_label' => t('Age:'),
'profile' => $profile,