Issue 6394: The contact location has to be BBEncoded

diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index bd455bc6ba4ca4898bf736b85c245d31d6fe5b05..39765e74ef0c4ebcc02d85f4217ac9f40b506ffc 100644 (file)
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -514,6 +514,10 @@ class Profile
                        $p['address'] = $p['location'];
                }
 
+               if (isset($p['address'])) {
+                       $p['address'] = BBCode::convert($p['address']);
+               }
+
                if (isset($p['photo'])) {
                        $p['photo'] = ProxyUtils::proxifyUrl($p['photo'], false, ProxyUtils::SIZE_SMALL);
                }

diff --git a/src/Module/Contact.php b/src/Module/Contact.php
index 410f5878bb3f9fb20d2f01c5f182f889f8e0c2ec..06c6ee2417b5844cf97d7e651401b5289b80b828 100644 (file)
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@ -642,7 +642,7 @@ class Contact extends BaseModule
                                '$profileurllabel'=> L10n::t('Profile URL'),
                                '$profileurl'     => $contact['url'],
                                '$account_type'   => Model\Contact::getAccountType($contact),
-                               '$location'       => $contact['location'],
+                               '$location'       => BBCode::convert($contact['location']),
                                '$location_label' => L10n::t('Location:'),
                                '$xmpp'           => BBCode::convert($contact['xmpp']),
                                '$xmpp_label'     => L10n::t('XMPP:'),

diff --git a/view/templates/contact_edit.tpl b/view/templates/contact_edit.tpl
index 6f63dde2b6ce768dd8c08aea8be3847f8e3f5083..644121cadd082b13b1935f7aadc917a1bf11096f 100644 (file)
--- a/view/templates/contact_edit.tpl
+++ b/view/templates/contact_edit.tpl
@@ -53,7 +53,7 @@
 
                                {{* Some information about the contact from the profile *}}
                                <dl><dt>{{$profileurllabel}}</dt><dd><a target="blank" href="{{$url}}">{{$profileurl}}</a></dd></dl>
-                               {{if $location}}<dl><dt>{{$location_label}}</dt><dd>{{$location}}</dd></dl>{{/if}}
+                               {{if $location}}<dl><dt>{{$location_label}}</dt><dd>{{$location nofilter}}</dd></dl>{{/if}}
                                {{if $xmpp}}<dl><dt>{{$xmpp_label}}</dt><dd>{{$xmpp}}</dd></dl>{{/if}}
                                {{if $keywords}}<dl><dt>{{$keywords_label}}</dt><dd>{{$keywords}}</dd></dl>{{/if}}
                                {{if $about}}<dl><dt>{{$about_label}}</dt><dd>{{$about nofilter}}</dd></dl>{{/if}}

diff --git a/view/templates/profile_vcard.tpl b/view/templates/profile_vcard.tpl
index 124fca154f16f965182c249a31b26e42208ea0f3..192c860de8a0e626b756ab88f32fcb680a1e6a07 100644 (file)
--- a/view/templates/profile_vcard.tpl
+++ b/view/templates/profile_vcard.tpl
@@ -17,7 +17,7 @@
        {{if $location}}
                <dl class="location"><dt class="location-label">{{$location}}</dt> 
                <dd class="adr h-adr">
-                       {{if $profile.address}}<div class="street-address p-street-address">{{$profile.address}}</div>{{/if}}
+                       {{if $profile.address}}<div class="street-address p-street-address">{{$profile.address nofilter}}</div>{{/if}}
                        <span class="city-state-zip">
                                <span class="locality p-locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
                                <span class="region p-region">{{$profile.region}}</span>

diff --git a/view/theme/duepuntozero/templates/profile_vcard.tpl b/view/theme/duepuntozero/templates/profile_vcard.tpl
index a7d0a0bc5adc13443c4fbc8d98782493385733d2..d80b8feed221c0b54d7ac12bfaa2c726023a45d7 100644 (file)
--- a/view/theme/duepuntozero/templates/profile_vcard.tpl
+++ b/view/theme/duepuntozero/templates/profile_vcard.tpl
@@ -15,7 +15,7 @@
        {{if $location}}
                <dl class="location"><dt class="location-label">{{$location}}</dt> 
                <dd class="adr h-adr">
-                       {{if $profile.address}}<div class="street-address p-street-address">{{$profile.address}}</div>{{/if}}
+                       {{if $profile.address}}<div class="street-address p-street-address">{{$profile.address nofilter}}</div>{{/if}}
                        <span class="city-state-zip">
                                <span class="locality p-locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
                                <span class="region p-region">{{$profile.region}}</span>

diff --git a/view/theme/frio/templates/contact_edit.tpl b/view/theme/frio/templates/contact_edit.tpl
index 70ebdcd0c87c0f684bebc638710aed3beb6d8ae5..92ff615a9896400a83ba4273ce48e3c292a6f7c5 100644 (file)
--- a/view/theme/frio/templates/contact_edit.tpl
+++ b/view/theme/frio/templates/contact_edit.tpl
@@ -88,7 +88,7 @@
                                                                <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
                                                                        <hr class="profile-separator">
                                                                        <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 text-muted">{{$location_label}}</div>
-                                                                       <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12">{{$location}}</div>
+                                                                       <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12">{{$location nofilter}}</div>
                                                                </div>
                                                                {{/if}}
 

diff --git a/view/theme/frio/templates/profile_vcard.tpl b/view/theme/frio/templates/profile_vcard.tpl
index 0649f8a551bc03056a4850037b142af95bf2bd8c..462fb356775eea68eea3ac5bf21ce9161d17d7d5 100644 (file)
--- a/view/theme/frio/templates/profile_vcard.tpl
+++ b/view/theme/frio/templates/profile_vcard.tpl
@@ -76,7 +76,7 @@
                <div class="location detail">
                        <span class="location-label icon"><i class="fa fa-map-marker"></i></span>
                        <span class="adr">
-                               {{if $profile.address}}<span class="street-address p-street-address">{{$profile.address}}</span>{{/if}}
+                               {{if $profile.address}}<span class="street-address p-street-address">{{$profile.address nofilter}}</span>{{/if}}
                                <span class="city-state-zip">
                                        <span class="locality p-locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
                                        <span class="region p-region">{{$profile.region}}</span>

diff --git a/view/theme/quattro/templates/profile_vcard.tpl b/view/theme/quattro/templates/profile_vcard.tpl
index 68028fe91e97f100d46fa8732886059645eddb84..927047cd332d950cc071bb0d96fb98992e2be360 100644 (file)
--- a/view/theme/quattro/templates/profile_vcard.tpl
+++ b/view/theme/quattro/templates/profile_vcard.tpl
@@ -38,7 +38,7 @@
        {{if $location}}
                <dl class="location"><dt class="location-label">{{$location}}</dt> 
                <dd class="adr h-adr">
-                       {{if $profile.address}}<div class="street-address p-street-address">{{$profile.address}}</div>{{/if}}
+                       {{if $profile.address}}<div class="street-address p-street-address">{{$profile.address nofilter}}</div>{{/if}}
                        <span class="city-state-zip">
                                <span class="locality p-locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
                                <span class="region p-region">{{$profile.region}}</span>

diff --git a/view/theme/vier/templates/contact_edit.tpl b/view/theme/vier/templates/contact_edit.tpl
index 8fbbbfc380c784462ef0907fedad9dc4c7c7e494..a01fac9ee4f9fdcee0c6160e173832620950b42b 100644 (file)
--- a/view/theme/vier/templates/contact_edit.tpl
+++ b/view/theme/vier/templates/contact_edit.tpl
@@ -54,7 +54,7 @@
 
                                {{* Some information about the contact from the profile *}}
                                <dl><dt>{{$profileurllabel}}</dt><dd><a target="blank" href="{{$url}}">{{$profileurl}}</a></dd></dl>
-                               {{if $location}}<dl><dt>{{$location_label}}</dt><dd>{{$location}}</dd></dl>{{/if}}
+                               {{if $location}}<dl><dt>{{$location_label}}</dt><dd>{{$location nofilter}}</dd></dl>{{/if}}
                                {{if $xmpp}}<dl><dt>{{$xmpp_label}}</dt><dd>{{$xmpp}}</dd></dl>{{/if}}
                                {{if $keywords}}<dl><dt>{{$keywords_label}}</dt><dd>{{$keywords}}</dd></dl>{{/if}}
                                {{if $about}}<dl><dt>{{$about_label}}</dt><dd>{{$about nofilter}}</dd></dl>{{/if}}

diff --git a/view/theme/vier/templates/profile_vcard.tpl b/view/theme/vier/templates/profile_vcard.tpl
index b37f5d25916b34cb69b23a3328f2d12b82c6d1b9..70bc13e82bb41d01588c5160066f4e450f0db72a 100644 (file)
--- a/view/theme/vier/templates/profile_vcard.tpl
+++ b/view/theme/vier/templates/profile_vcard.tpl
@@ -28,7 +28,7 @@
        {{if $location}}
                <dl class="location"><dt class="location-label">{{$location}}</dt> 
                <dd class="adr h-adr">
-                       {{if $profile.address}}<div class="street-address p-street-address">{{$profile.address}}</div>{{/if}}
+                       {{if $profile.address}}<div class="street-address p-street-address">{{$profile.address nofilter}}</div>{{/if}}
                        <span class="city-state-zip">
                                <span class="locality p-locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
                                <span class="region p-region">{{$profile.region}}</span>