Merge https://github.com/friendica/friendica into pull

[friendica.git] / view / theme / facepark / profile_vcard.tpl

diff --git a/view/theme/facepark/profile_vcard.tpl b/view/theme/facepark/profile_vcard.tpl
index ee73460fc2970fc6b227386871f2fecf666fcd6d..07d2df5df31a10102b074a23e0ab74512b56f31a 100644 (file)
--- a/view/theme/facepark/profile_vcard.tpl
+++ b/view/theme/facepark/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 }}
@@ -31,7 +31,7 @@
 
        {{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
 
-       {{ inc diaspora_vcard.tpl with $diaspora=$diaspora_info }}{{ endinc }}
+       {{ inc diaspora_vcard.tpl }}{{ endinc }}
        
        <div id="profile-extra-links">
                <ul>