Merge branch 'master' of https://github.com/annando/friendica

[friendica.git] / mod / directory.php

diff --git a/mod/directory.php b/mod/directory.php
index 833a4f81cc0da7deb5c68b27c6997de2907b506d..3e138570cbf84688f489d6dcd4addc010c691225 100644 (file)
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -143,16 +143,23 @@ function directory_content(&$a) {
                        
                        $tpl = get_markup_template('directory_item.tpl');
 
+                       if($a->theme['template_engine'] === 'internal') {
+                               $location_e = template_escape($location);
+                       }
+                       else {
+                               $location_e = $location;
+                       }
+
                        $entry = replace_macros($tpl,array(
                                '$id' => $rr['id'],
-                               '$profile-link' => $profile_link,
+                               '$profile_link' => $profile_link,
                                '$photo' => $a->get_cached_avatar_image($rr[$photo]),
-                               '$alt-text' => $rr['name'],
+                               '$alt_text' => $rr['name'],
                                '$name' => $rr['name'],
                                '$details' => $pdesc . $details,
-                               '$page-type' => $page_type,
+                               '$page_type' => $page_type,
                                '$profile' => $profile,
-                               '$location' => template_escape($location),
+                               '$location' => $location_e,
                                '$gender'   => $gender,
                                '$pdesc'        => $pdesc,
                                '$marital'  => $marital,