Merge remote-tracking branch 'upstream/develop' into 1601-gcontact-total

[friendica.git] / mod / crepair.php

diff --git a/mod/crepair.php b/mod/crepair.php
index d16adf8c745b6083b5911e7e5c3af3368a417aa2..6f951bdf6eade2dcd2321e63f250455892fe152c 100644 (file)
--- a/mod/crepair.php
+++ b/mod/crepair.php
@@ -23,14 +23,9 @@ function crepair_init(&$a) {
                $a->page['aside'] = '';
 
        if($contact_id) {
-                       $a->data['contact'] = $r[0];
-                        $tpl = get_markup_template("vcard-widget.tpl");
-                        $vcard_widget .= replace_macros($tpl, array(
-                                '$name' => htmlentities($a->data['contact']['name']),
-                                '$photo' => $a->data['contact']['photo']
-                        ));
-                       $a->page['aside'] .= $vcard_widget;
-
+               $a->data['contact'] = $r[0];
+                $contact = $r[0];
+               profile_load($a, "", 0, get_contact_details_by_url($contact["url"]));
        }
 }
 
@@ -159,19 +154,12 @@ function crepair_content(&$a) {
 
        $update_profile = in_array($contact['network'], array(NETWORK_DFRN, NETWORK_DSPR, NETWORK_OSTATUS));
 
-       $tab_str = contact_tabs($a, $contact['id'], 3);
-
-       $header = $contact["name"];
-
-       if ($contact["addr"] != "")
-                $header .= " <".$contact["addr"].">";
+       $tab_str = contacts_tab($a, $contact['id'], 5);
 
-        $header .= " (".network_to_name($contact['network'], $contact['url']).")";
 
        $tpl = get_markup_template('crepair.tpl');
        $o .= replace_macros($tpl, array(
                //'$title'      => t('Repair Contact Settings'),
-               '$title'        => htmlentities($header),
                '$tab_str'      => $tab_str,
                '$warning'      => $warning,
                '$info'         => $info,