Merge pull request #1994 from tobiasd/20151028-issue1974

[friendica.git] / mod / common.php

diff --git a/mod/common.php b/mod/common.php
index 574443f4831319103871303eb67944fce1c20ac4..1e65137ac693c74dcc125b1e9af213a70bcb2ac3 100644 (file)
--- a/mod/common.php
+++ b/mod/common.php
@@ -16,7 +16,7 @@ function common_content(&$a) {
        if(! $uid)
                return;
 
-       if($cmd === 'loc' && $cid) {    
+       if($cmd === 'loc' && $cid) {
                $c = q("select name, url, photo from contact where id = %d and uid = %d limit 1",
                        intval($cid),
                        intval($uid)
@@ -26,19 +26,24 @@ function common_content(&$a) {
                $c = q("select name, url, photo from contact where self = 1 and uid = %d limit 1",
                        intval($uid)
                );
-       }       
+       }
+
+       $vcard_widget .= replace_macros(get_markup_template("vcard-widget.tpl"),array(
+               '$name' => htmlentities($c[0]['name']),
+               '$photo' => $c[0]['photo'],
+               'url' => z_root() . '/contacts/' . $cid
+       ));
 
-       $a->page['aside'] .= replace_macros(get_markup_template("vcard-widget.tpl"),array(
-                '$name' => $c[0]['name'],
-                '$photo' => $c[0]['photo'],
-                'url' => $a->get_baseurl() . '/contacts/' . $cid
-                ));
-       
+       if(! x($a->page,'aside'))
+               $a->page['aside'] = '';
+       $a->page['aside'] .= $vcard_widget;
 
        if(! count($c))
                return;
 
-       $o .= '<h2>' . t('Common Friends') . '</h2>';
+       $o .= replace_macros(get_markup_template("section_title.tpl"),array(
+               '$title' => t('Common Friends')
+       ));
 
 
        if(! $cid) {
@@ -92,10 +97,10 @@ function common_content(&$a) {
        $tpl = get_markup_template('common_friends.tpl');
 
        foreach($r as $rr) {
-                       
+
                $o .= replace_macros($tpl,array(
                        '$url' => $rr['url'],
-                       '$name' => $rr['name'],
+                       '$name' => htmlentities($rr['name']),
                        '$photo' => $rr['photo'],
                        '$tags' => ''
                ));