From 431c402719256e50fa30916c1e4d4d920fd47859 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 6 Jan 2013 02:21:25 -0800
Subject: [PATCH] remove dash template vars from forumdirectory

---
 forumdirectory.tgz                            | Bin 3802 -> 3801 bytes
 forumdirectory/forumdirectory.php             |   6 +++---
 forumdirectory/view/forumdirectory_item.tpl   |   6 +++---
 .../view/smarty3/forumdirectory_item.tpl      |   6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/forumdirectory.tgz b/forumdirectory.tgz
index 249cd22645f56aa842c15b68551b885e89cfbc55..0a84585dd41af97f49d12658c1f3576c295b5c4b 100644
GIT binary patch
literal 3801
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
PKh*vM6BE-x08jt`RX1ka

literal 3802
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
Q_D^m91=AT~H~>%p0OQtj8~^|S

diff --git a/forumdirectory/forumdirectory.php b/forumdirectory/forumdirectory.php
index 0d7fbee8..9837b9c1 100644
--- 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 3b24d25f..e1bbffec 100755
--- 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 540a5aea..66410efe 100644
--- 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}}">