remove dashes from variable names in profile_vcard.tpl

diff --git a/boot.php b/boot.php
index 77be9ac26125145b9e47046b14e21d7cd967ffb3..1d43008896d59613bcc1b102b0e4f0a707aa7743 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -1345,12 +1345,17 @@ if(! function_exists('profile_sidebar')) {
 
                $tpl = get_markup_template('profile_vcard.tpl');
 
+               $p = array();
+               foreach($profile as $k => $v) {
+                       $k = str_replace('-','_',$k);
+                       $p[$k] = $v;
+               }
 
                if($a->theme['template_engine'] === 'internal')
                        $location = template_escape($location);
 
                $o .= replace_macros($tpl, array(
-                       '$profile' => $profile,
+                       '$profile' => $p,
                        '$connect'  => $connect,
                        '$wallmessage' => $wallmessage,
                        '$location' => $location,

diff --git a/view/profile_vcard.tpl b/view/profile_vcard.tpl
index d1e6847951628e784f0a3983b66c5a2ca7c46d99..6e137f28fa1a168f502fe8adac028e95304e0485 100644 (file)
--- a/view/profile_vcard.tpl
+++ b/view/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 }}

diff --git a/view/smarty3/profile_vcard.tpl b/view/smarty3/profile_vcard.tpl
index 86f25fe057b7b966ff10ccd9411cba28a84fdf89..4e3b1f366e0007b332da05bfdb66eac18d8af8a9 100644 (file)
--- a/view/smarty3/profile_vcard.tpl
+++ b/view/smarty3/profile_vcard.tpl
@@ -16,9 +16,9 @@
                        <span class="city-state-zip">
                                <span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
                                <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>{{/if}}
+                       {{if $profile.country_name}}<span class="country-name">{{$profile.country_name}}</span>{{/if}}
                </dd>
                </dl>
        {{/if}}