X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Ftheme%2Fvier%2Ftemplates%2Fprofile_vcard.tpl;h=6331e84c4e6f0e90d5d4b2bee1c092ca46d065ba;hb=3aebb92cf3e9248dc4c6871b1f43cc02bdf28bfe;hp=b37f5d25916b34cb69b23a3328f2d12b82c6d1b9;hpb=94eca7704130822bf83bb5fee6930dee6bae81dd;p=friendica.git

diff --git a/view/theme/vier/templates/profile_vcard.tpl b/view/theme/vier/templates/profile_vcard.tpl
index b37f5d2591..6331e84c4e 100644
--- 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>
@@ -61,21 +61,20 @@
 	{{if $about}}<dl class="about"><dt class="about-label">{{$about}}</dt><dd class="x-network">{{$profile.about nofilter}}</dd></dl>{{/if}}
 
 	{{include file="diaspora_vcard.tpl"}}
-	
+
 	<div id="profile-extra-links">
 		<ul>
-			{{if $connect}}
-				{{if $remoteconnect}}
-					<li><a id="dfrn-request-link" href="{{$remoteconnect}}">{{$connect}}</a></li>
-				{{else}}
-					<li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
-				{{/if}}
+			{{if $unfollow_link}}
+				<li><a id="dfrn-request-link" href="{{$unfollow_link}}">{{$unfollow}}</a></li>
+			{{/if}}
+			{{if $follow_link}}
+				<li><a id="dfrn-request-link" href="{{$follow_link}}">{{$follow}}</a></li>
 			{{/if}}
-			{{if $wallmessage}}
+			{{if $wallmessage_link}}
 				<li><a id="wallmessage-link" href="{{$wallmessage_link}}">{{$wallmessage}}</a></li>
 			{{/if}}
-			{{if $subscribe_feed}}
-				<li><a id="subscribe-feed-link" href="dfrn_poll/{{$profile.nickname}}">{{$subscribe_feed}}</a></li>
+			{{if $subscribe_feed_link}}
+				<li><a id="subscribe-feed-link" href="{{$subscribe_feed_link}}">{{$subscribe_feed}}</a></li>
 			{{/if}}
 		</ul>
 	</div>