little revision

diff --git a/mod/allfriends.php b/mod/allfriends.php
index bbdc5ef4581a79cfffb8843f50e49119c3a45d55..b73c55c2268433af39e49c867803b614386c1f75 100644 (file)
--- a/mod/allfriends.php
+++ b/mod/allfriends.php
@@ -20,12 +20,15 @@ function allfriends_content(&$a) {
                intval(local_user())
        );
 
-       $a->page['aside'] .= replace_macros(get_markup_template("vcard-widget.tpl"),array(
+       $vcard_widget .= 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;

diff --git a/mod/common.php b/mod/common.php
index 574443f4831319103871303eb67944fce1c20ac4..6a1bf4e31bdc99447dc48bd2cd31b6ec85faa22f 100644 (file)
--- a/mod/common.php
+++ b/mod/common.php
@@ -28,12 +28,15 @@ function common_content(&$a) {
                );
        }       
 
-       $a->page['aside'] .= replace_macros(get_markup_template("vcard-widget.tpl"),array(
+       $vcard_widget .= 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;

diff --git a/mod/crepair.php b/mod/crepair.php
index 7cc67d4c83d15639ac9b4a7fcaa4c0a89f4711d0..457a06685db35df037ebfd41c2796b961caf0195 100644 (file)
--- a/mod/crepair.php
+++ b/mod/crepair.php
@@ -23,11 +23,11 @@ function crepair_init(&$a) {
        if($contact_id) {
                        $a->data['contact'] = $r[0];
                         $tpl = get_markup_template("vcard-widget.tpl");
-                        $o .= replace_macros($tpl, array(
+                        $vcard_widget .= replace_macros($tpl, array(
                                 '$name' => $a->data['contact']['name'],
                                 '$photo' => $a->data['contact']['photo']
                         ));
-                       $a->page['aside'] .= $o;
+                       $a->page['aside'] .= $vcard_widget;
 
        }
 }

diff --git a/mod/photos.php b/mod/photos.php
index 657f23236d16851037e74309b3bffdb640d81de7..ebb88c73914b81dcc902de3357bb80d0c77e6315 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -34,7 +34,7 @@ function photos_init(&$a) {
 
                 $tpl = get_markup_template("vcard-widget.tpl");
 
-               $o .= replace_macros($tpl, array(
+               $vcard_widget .= replace_macros($tpl, array(
                         '$name' => $a->data['user']['username'],
                         '$photo' => $profilephoto
                 ));
@@ -76,6 +76,7 @@ function photos_init(&$a) {
 
                if(! x($a->page,'aside'))
                        $a->page['aside'] = '';
+                $a->page['aside'] .= $vcard_widget;
                $a->page['aside'] .= $o;
 
 

diff --git a/mod/videos.php b/mod/videos.php
index bc076e740a7a2cf87e3b64c14b63833ad0fbedfa..5553bbbeb3a601cdbf79aa58d05bb12cbb84ae63 100644 (file)
--- a/mod/videos.php
+++ b/mod/videos.php
@@ -32,7 +32,7 @@ function videos_init(&$a) {
 
                 $tpl = get_markup_template("vcard-widget.tpl");
 
-               $o .= replace_macros($tpl, array(
+               $vcard_widget = replace_macros($tpl, array(
                         '$name' => $a->data['user']['username'],
                         '$photo' => $profilephoto
                 ));
@@ -74,7 +74,7 @@ function videos_init(&$a) {
 
                if(! x($a->page,'aside'))
                        $a->page['aside'] = '';
-               $a->page['aside'] .= $o;
+               $a->page['aside'] .= $vcard_widget;
 
 
                $tpl = get_markup_template("videos_head.tpl");