In the profiles the remote connect field was missing

diff --git a/mod/noscrape.php b/mod/noscrape.php
index 41ccc30adcb5ba3d1df9e3a0b9baa79a032458da..8863d3391d2f169be8b8393bd95d339dbd98ec3f 100644 (file)
--- a/mod/noscrape.php
+++ b/mod/noscrape.php
@@ -48,4 +48,4 @@ function noscrape_init(&$a) {
        echo json_encode($json_info);
        exit;
        
-}
\ No newline at end of file
+}

diff --git a/view/templates/profile_vcard.tpl b/view/templates/profile_vcard.tpl
index b872e8278eecab7f0ad769145b0b5a66ad1b0360..4ec3cdf3c72948c22f64e65bc2c52ef1865fe280 100644 (file)
--- a/view/templates/profile_vcard.tpl
+++ b/view/templates/profile_vcard.tpl
@@ -40,8 +40,12 @@
        <div id="profile-extra-links">
                <ul>
                        {{if $connect}}
-                               <li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
-                       {{/if}}
+                                {{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}}
                        {{if $wallmessage}}
                                <li><a id="wallmessage-link" href="wallmessage/{{$profile.nickname}}">{{$wallmessage}}</a></li>
                        {{/if}}

diff --git a/view/theme/duepuntozero/templates/profile_vcard.tpl b/view/theme/duepuntozero/templates/profile_vcard.tpl
index 6e097c62bf07f8d978c091b86a2a0b87363c7499..9a34605732d223c8af688dfa16c743ca64e80840 100644 (file)
--- a/view/theme/duepuntozero/templates/profile_vcard.tpl
+++ b/view/theme/duepuntozero/templates/profile_vcard.tpl
@@ -38,8 +38,12 @@
        <div id="profile-extra-links">
                <ul>
                        {{if $connect}}
-                               <li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
-                       {{/if}}
+                                {{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}}
                        {{if $wallmessage}}
                                <li><a id="wallmessage-link" href="wallmessage/{{$profile.nickname}}">{{$wallmessage}}</a></li>
                        {{/if}}

diff --git a/view/theme/quattro/templates/profile_vcard.tpl b/view/theme/quattro/templates/profile_vcard.tpl
index 0c44a7f4396c22a005862b8447597107555caad4..d57169dcc1781728d075bcd89e2023a37d217a38 100644 (file)
--- a/view/theme/quattro/templates/profile_vcard.tpl
+++ b/view/theme/quattro/templates/profile_vcard.tpl
@@ -61,8 +61,12 @@
        <div id="profile-extra-links">
                <ul>
                        {{if $connect}}
-                               <li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
-                       {{/if}}
+                                {{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}}
                        {{if $wallmessage}}
                                <li><a id="wallmessage-link" href="wallmessage/{{$profile.nickname}}">{{$wallmessage}}</a></li>
                        {{/if}}

diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php
index b49ba52a24ac3fd0aac6e542b52f19af4db57e7c..88ad046675dd7e3fc4cf5fbe838826aaa8e076a1 100644 (file)
--- a/view/theme/vier/theme.php
+++ b/view/theme/vier/theme.php
@@ -30,7 +30,7 @@ else if ($style == "plus")
        $a->page['htmlhead'] .= '<link rel="stylesheet" href="view/theme/vier/plus.css" type="text/css" media="screen"/>'."\n";
 
 $a->page['htmlhead'] .= <<< EOT
-<script>
+<script type="text/javascript">
 
 function collapseHeight(elems) {
        var elemName = '.wall-item-body:not(.divmore)';