From eac29badb2fade43dfe3fd6373ffc675858143dd Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 30 Aug 2012 18:17:38 -0700
Subject: start on contacts/profiles

---
 view/theme/diabook/directory_item.tpl    | 4 ++--
 view/theme/diabook/profile_vcard.tpl     | 4 ++--
 view/theme/diabook/theme.php             | 2 +-
 view/theme/dispy/profile_vcard.tpl       | 4 ++--
 view/theme/quattro/tpl/profile_vcard.tpl | 4 ++--
 view/tpl/profile_vcard.tpl               | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'view')

diff --git a/view/theme/diabook/directory_item.tpl b/view/theme/diabook/directory_item.tpl
index 70d197955..d2ed0ee8f 100644
--- a/view/theme/diabook/directory_item.tpl
+++ b/view/theme/diabook/directory_item.tpl
@@ -20,9 +20,9 @@
 					<span class="city-state-zip">
 						<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
 						<span class="region">$profile.region</span>
-						<span class="postal-code">$profile.postal-code</span>
+						<span class="postal-code">$profile.postal_code</span>
 					</span>
-					{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
+					{{ if $profile.country_name }}<span class="country-name">$profile.country_name</span>{{ endif }}
 				</dd>
 				</dl>
 			{{ endif }}
diff --git a/view/theme/diabook/profile_vcard.tpl b/view/theme/diabook/profile_vcard.tpl
index b982a2069..825145825 100644
--- a/view/theme/diabook/profile_vcard.tpl
+++ b/view/theme/diabook/profile_vcard.tpl
@@ -33,9 +33,9 @@
 			<span class="city-state-zip">
 				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
 				<span class="region">$profile.region</span>
-				<span class="postal-code">$profile.postal-code</span>
+				<span class="postal-code">$profile.postal_code</span>
 			</span>
-			{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
+			{{ if $profile.country_name }}<span class="country-name">$profile.country_name</span>{{ endif }}
 		</dd>
 		</dl>
 	{{ endif }}
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 2c8290344..718db2ccf 100644
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -516,7 +516,7 @@ if ($color=="dark") $color_path = "/diabook-dark/";
 
 	$r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`
 			FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` 
-			WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra $order LIMIT %d , %d ",
+			WHERE `is_default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra $order LIMIT %d , %d ",
 		0,
 		9
 	);
diff --git a/view/theme/dispy/profile_vcard.tpl b/view/theme/dispy/profile_vcard.tpl
index cf0054a67..b7c99edd9 100644
--- a/view/theme/dispy/profile_vcard.tpl
+++ b/view/theme/dispy/profile_vcard.tpl
@@ -34,9 +34,9 @@
 			<span class="city-state-zip">
 				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
 				<span class="region">$profile.region</span>
-				<span class="postal-code">$profile.postal-code</span>
+				<span class="postal-code">$profile.postal_code</span>
 			</span>
-			{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
+			{{ if $profile.country_name }}<span class="country-name">$profile.country_name</span>{{ endif }}
 		</div>
 		</div>
 	{{ endif }}
diff --git a/view/theme/quattro/tpl/profile_vcard.tpl b/view/theme/quattro/tpl/profile_vcard.tpl
index 7cd02f164..5d7e92131 100644
--- a/view/theme/quattro/tpl/profile_vcard.tpl
+++ b/view/theme/quattro/tpl/profile_vcard.tpl
@@ -32,9 +32,9 @@
 			<span class="city-state-zip">
 				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
 				<span class="region">$profile.region</span>
-				<span class="postal-code">$profile.postal-code</span>
+				<span class="postal-code">$profile.postal_code</span>
 			</span>
-			{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
+			{{ if $profile.country_name }}<span class="country-name">$profile.country_name</span>{{ endif }}
 		</dd>
 		</dl>
 	{{ endif }}
diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl
index 8de1b03da..3360016bc 100644
--- a/view/tpl/profile_vcard.tpl
+++ b/view/tpl/profile_vcard.tpl
@@ -16,9 +16,9 @@
 			<span class="city-state-zip">
 				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
 				<span class="region">$profile.region</span>
-				<span class="postal-code">$profile.postal-code</span>
+				<span class="postal-code">$profile.postal_code</span>
 			</span>
-			{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
+			{{ if $profile.country_name }}<span class="country-name">$profile.country_name</span>{{ endif }}
 		</dd>
 		</dl>
 	{{ endif }}
-- 
cgit v1.2.3