remove dash template vars from forumdirectory

diff --git a/forumdirectory.tgz b/forumdirectory.tgz
index 249cd22645f56aa842c15b68551b885e89cfbc55..0a84585dd41af97f49d12658c1f3576c295b5c4b 100644 (file)
Binary files a/forumdirectory.tgz and b/forumdirectory.tgz differ

diff --git a/forumdirectory/forumdirectory.php b/forumdirectory/forumdirectory.php
index 0d7fbee804891533deffd4b888cbc0f09c081546..9837b9c18aa878f84c4a7bdf0a5f654b76a57acc 100644 (file)
--- a/forumdirectory/forumdirectory.php
+++ b/forumdirectory/forumdirectory.php
@@ -168,12 +168,12 @@ function forumdirectory_content(&$a) {
 
                        $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),
                                '$gender'   => $gender,

diff --git a/forumdirectory/view/forumdirectory_item.tpl b/forumdirectory/view/forumdirectory_item.tpl
index 3b24d25f2b9acca86a6b043d1e0cd53810e10192..e1bbffec8223051dce3ac956928329c6eeca5065 100755 (executable)
--- a/forumdirectory/view/forumdirectory_item.tpl
+++ b/forumdirectory/view/forumdirectory_item.tpl
@@ -2,14 +2,14 @@
 <div class="forumdirectory-item" id="forumdirectory-item-$id" >
        <div class="forumdirectory-photo-wrapper" id="forumdirectory-photo-wrapper-$id" > 
                <div class="forumdirectory-photo" id="forumdirectory-photo-$id" >
-                       <a href="$profile-link" class="forumdirectory-profile-link" id="forumdirectory-profile-link-$id" >
-                               <img class="forumdirectory-photo-img photo" src="$photo" alt="$alt-text" title="$alt-text" />
+                       <a href="$profile_link" class="forumdirectory-profile-link" id="forumdirectory-profile-link-$id" >
+                               <img class="forumdirectory-photo-img photo" src="$photo" alt="$alt_text" title="$alt_text" />
                        </a>
                </div>
        </div>
        <div class="forumdirectory-profile-wrapper" id="forumdirectory-profile-wrapper-$id" >
                <div class="contact-name" id="forumdirectory-name-$id">$name</div>
-               <div class="page-type">$page-type</div>
+               <div class="page-type">$page_type</div>
                {{ if $pdesc }}<div class="forumdirectory-profile-title">$profile.pdesc</div>{{ endif }}
        <div class="forumdirectory-detailcolumns-wrapper" id="forumdirectory-detailcolumns-wrapper-$id">
                <div class="forumdirectory-detailscolumn-wrapper" id="forumdirectory-detailscolumn1-wrapper-$id">       

diff --git a/forumdirectory/view/smarty3/forumdirectory_item.tpl b/forumdirectory/view/smarty3/forumdirectory_item.tpl
index 540a5aeae7d61d5575b38a0c8d539829be23e676..66410efed8645a5bdc6b9695b8b75e0b1e99ce06 100644 (file)
--- a/forumdirectory/view/smarty3/forumdirectory_item.tpl
+++ b/forumdirectory/view/smarty3/forumdirectory_item.tpl
@@ -2,14 +2,14 @@
 <div class="forumdirectory-item" id="forumdirectory-item-{{$id}}" >
        <div class="forumdirectory-photo-wrapper" id="forumdirectory-photo-wrapper-{{$id}}" > 
                <div class="forumdirectory-photo" id="forumdirectory-photo-{{$id}}" >
-                       <a href="{{$profile}}-link" class="forumdirectory-profile-link" id="forumdirectory-profile-link-{{$id}}" >
-                               <img class="forumdirectory-photo-img photo" src="{{$photo}}" alt="{{$alt}}-text" title="{{$alt}}-text" />
+                       <a href="{{$profile_link}}" class="forumdirectory-profile-link" id="forumdirectory-profile-link-{{$id}}" >
+                               <img class="forumdirectory-photo-img photo" src="{{$photo}}" alt="{{$alt_text}}" title="{{$alt_text}}" />
                        </a>
                </div>
        </div>
        <div class="forumdirectory-profile-wrapper" id="forumdirectory-profile-wrapper-{{$id}}" >
                <div class="contact-name" id="forumdirectory-name-{{$id}}">{{$name}}</div>
-               <div class="page-type">{{$page}}-type</div>
+               <div class="page-type">{{$page_type}}</div>
                {{if $pdesc}}<div class="forumdirectory-profile-title">{{$profile.pdesc}}</div>{{/if}}
        <div class="forumdirectory-detailcolumns-wrapper" id="forumdirectory-detailcolumns-wrapper-{{$id}}">
                <div class="forumdirectory-detailscolumn-wrapper" id="forumdirectory-detailscolumn1-wrapper-{{$id}}">