Bugfix: Repairing a contact was more like killing the contact ...

diff --git a/mod/contacts.php b/mod/contacts.php
index 89154eded9ce0437177db0546a2ef515022c401e..f3b8a1deffe9fa2a234461a282276dca93496162 100644 (file)
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -243,7 +243,7 @@ function _contact_update_profile($contact_id) {
                return;
 
        $updatefields = array("name", "nick", "url", "addr", "batch", "notify", "poll", "request", "confirm",
-                               "poco", "network", "alias", "pubkey");
+                               "poco", "network", "alias");
        $update = array();
 
        if ($data["network"] == NETWORK_OSTATUS) {

diff --git a/mod/follow.php b/mod/follow.php
index 7b1957c93be0728f5e6c3dee2beb95c5d1dc3276..8affa11b560cde4514e3576700b27e0f36cc794f 100644 (file)
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -94,6 +94,7 @@ function follow_content(&$a) {
                        '$nickname' => "",
                        '$name' => $ret["name"],
                        '$url' => $ret["url"],
+                       '$zrl' => zrl($ret["url"]),
                        '$url_label' => t("Profile URL"),
                        '$myaddr' => $myaddr,
                        '$request' => $request,

diff --git a/view/templates/auto_request.tpl b/view/templates/auto_request.tpl
index 09e6163325206bd4cb17515f35deae0e4c0da56a..f938d6371927494150f9a65994c87d180b51d0b0 100644 (file)
--- a/view/templates/auto_request.tpl
+++ b/view/templates/auto_request.tpl
@@ -28,7 +28,7 @@
 <img src="{{$photo}}" alt="" id="dfrn-request-photo">
 {{/if}}
 
-{{if $url}}<dl><dt>{{$url_label}}</dt><dd><a target="blank" href="{{$url}}">{{$url}}</a></dd></dl>{{/if}}
+{{if $url}}<dl><dt>{{$url_label}}</dt><dd><a target="blank" href="{{$zrl}}">{{$url}}</a></dd></dl>{{/if}}
 {{if $location}}<dl><dt>{{$location_label}}</dt><dd>{{$location}}</dd></dl>{{/if}}
 {{if $keywords}}<dl><dt>{{$keywords_label}}</dt><dd>{{$keywords}}</dd></dl>{{/if}}
 {{if $about}}<dl><dt>{{$about_label}}</dt><dd>{{$about}}</dd></dl>{{/if}}

diff --git a/view/templates/dfrn_request.tpl b/view/templates/dfrn_request.tpl
index d376b3a5d5795e29c02794d57d787996cc0fb03f..178586a7b7a3ae2597393c6d994fc5f0b536e848 100644 (file)
--- a/view/templates/dfrn_request.tpl
+++ b/view/templates/dfrn_request.tpl
@@ -27,7 +27,7 @@
 <img src="{{$photo}}" alt="" id="dfrn-request-photo">
 {{/if}}
 
-{{if $url}}<dl><dt>{{$url_label}}</dt><dd><a target="blank" href="{{$url}}">{{$url}}</a></dd></dl>{{/if}}
+{{if $url}}<dl><dt>{{$url_label}}</dt><dd><a target="blank" href="{{$zrl}}">{{$url}}</a></dd></dl>{{/if}}
 {{if $location}}<dl><dt>{{$location_label}}</dt><dd>{{$location}}</dd></dl>{{/if}}
 {{if $keywords}}<dl><dt>{{$keywords_label}}</dt><dd>{{$keywords}}</dd></dl>{{/if}}
 {{if $about}}<dl><dt>{{$about_label}}</dt><dd>{{$about}}</dd></dl>{{/if}}

diff --git a/view/templates/intros.tpl b/view/templates/intros.tpl
index 8e5a24a6b8d074fd017c6986699b9590e16cc348..b9f7f154184241361a47e434d9a13cf0a01c1ad0 100644 (file)
--- a/view/templates/intros.tpl
+++ b/view/templates/intros.tpl
@@ -4,7 +4,7 @@
 
 <p class="intro-desc">{{$str_notifytype}} {{$notify_type}}</p>
 <img id="photo-{{$contact_id}}" class="intro-photo" src="{{$photo}}" width="175" height=175" title="{{$fullname|escape:'html'}}" alt="{{$fullname|escape:'html'}}" />
-<dl><dt>{{$url_label}}</dt><dd><a target="blank" href="{{$url}}">{{$url}}</a></dd></dl>
+<dl><dt>{{$url_label}}</dt><dd><a target="blank" href="{{$zrl}}">{{$url}}</a></dd></dl>
 {{if $location}}<dl><dt>{{$location_label}}</dt><dd>{{$location}}</dd></dl>{{/if}}
 {{if $gender}}<dl><dt>{{$gender_label}}</dt><dd>{{$gender}}</dd></dl>{{/if}}
 {{if $keywords}}<dl><dt>{{$keywords_label}}</dt><dd>{{$keywords}}</dd></dl>{{/if}}