diff options
| author | Mario Vavti <mario@mariovavti.com> | 2015-06-29 14:25:04 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2015-06-29 14:25:04 +0200 |
| commit | 7ef439763428c7bea7dd2d70f358cf27128f3c79 (patch) | |
| tree | 568885c4e04e8b99e362da90206ce49378c82033 | |
| parent | 090dae46e500634cec8f3718fbb83d5dbb8f9690 (diff) | |
| download | volse-hubzilla-7ef439763428c7bea7dd2d70f358cf27128f3c79.tar.gz volse-hubzilla-7ef439763428c7bea7dd2d70f358cf27128f3c79.tar.bz2 volse-hubzilla-7ef439763428c7bea7dd2d70f358cf27128f3c79.zip | |
fix directory location
| -rw-r--r-- | mod/directory.php | 3 | ||||
| -rwxr-xr-x | view/tpl/direntry.tpl | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/mod/directory.php b/mod/directory.php index fa328462c..6d066a21b 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, diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl index 98ec25e23..6407f1edd 100755 --- a/view/tpl/direntry.tpl +++ b/view/tpl/direntry.tpl @@ -41,9 +41,9 @@ </div> {{/if}} - {{if $entry.details}} + {{if $entry.location}} <div class="contact-info-element"> - <span class="contact-info-label">{{$entry.location}}</span> {{$entry.details}} + <span class="contact-info-label">{{$entry.location_label}}</span> {{$entry.location}} </div> {{/if}} |