From c8482ae19effaed2a2e9237ef60d451e7e0c7260 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Thu, 11 Sep 2014 23:37:55 +0200
Subject: [PATCH 1/2] Bugfix: When repairing the url, the nurl wasn't set.

---
 mod/crepair.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mod/crepair.php b/mod/crepair.php
index 9828124ea7..d7eb14627c 100644
--- a/mod/crepair.php
+++ b/mod/crepair.php
@@ -60,12 +60,14 @@ function crepair_post(&$a) {
 	$attag   = ((x($_POST,'attag')) ? $_POST['attag'] : '');
 	$photo   = ((x($_POST,'photo')) ? $_POST['photo'] : '');
 	$remote_self = ((x($_POST,'remote_self')) ? $_POST['remote_self'] : false);
+	$nurl    = normalise_link($url);
 
-	$r = q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `url` = '%s', `request` = '%s', `confirm` = '%s', `notify` = '%s', `poll` = '%s', `attag` = '%s' , `remote_self` = %d
+	$r = q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `url` = '%s', `nurl` = '%s', `request` = '%s', `confirm` = '%s', `notify` = '%s', `poll` = '%s', `attag` = '%s' , `remote_self` = %d
 		WHERE `id` = %d AND `uid` = %d",
 		dbesc($name),
 		dbesc($nick),
 		dbesc($url),
+		dbesc($nurl),
 		dbesc($request),
 		dbesc($confirm),
 		dbesc($notify),

From f9bec79a2cb9ec95e36bdc2ac1059437198f7bee Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Thu, 11 Sep 2014 23:38:24 +0200
Subject: [PATCH 2/2] In the profiles the remote connect field was missing

---
 mod/noscrape.php                                    | 2 +-
 view/templates/profile_vcard.tpl                    | 8 ++++++--
 view/theme/duepuntozero/templates/profile_vcard.tpl | 8 ++++++--
 view/theme/quattro/templates/profile_vcard.tpl      | 8 ++++++--
 view/theme/vier/theme.php                           | 2 +-
 5 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/mod/noscrape.php b/mod/noscrape.php
index 41ccc30adc..8863d3391d 100644
--- 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 b872e8278e..4ec3cdf3c7 100644
--- 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 6e097c62bf..9a34605732 100644
--- 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 0c44a7f439..d57169dcc1 100644
--- 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 b49ba52a24..88ad046675 100644
--- 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)';