Merge develop into 0602_contact_profile

[friendica.git] / mod / display.php

diff --git a/mod/display.php b/mod/display.php
index ca57af923332e8bad1d51534e1ed41deeb02249f..4e33927072bdf8123e17abc7a485a22dd768666a 100644 (file)
--- a/mod/display.php
+++ b/mod/display.php
@@ -192,13 +192,20 @@ function display_fetchauthor($a, $item) {
                        $profiledata["photo"] = $r[0]["photo"];
                        $profiledata["nickname"] = $r[0]["nick"];
                        $profiledata["addr"] = $r[0]["addr"];
-                       $profiledata["keywords"] = $r[0]["keywords"];
                        $profiledata["network"] = $r[0]["network"];
 
+                       if ($r[0]["keywords"])
+                               $profiledata["keywords"] = $r[0]["keywords"];
+
                        if ($showdetails) {
-                               $profiledata["address"] = $r[0]["location"];
-                               $profiledata["about"] = $r[0]["about"];
-                               $profiledata["gender"] = $r[0]["gender"];
+                               if ($r[0]["location"])
+                                       $profiledata["address"] = $r[0]["location"];
+
+                               if ($r[0]["about"])
+                                       $profiledata["about"] = $r[0]["about"];
+
+                               if ($r[0]["gender"])
+                                       $profiledata["gender"] = $r[0]["gender"];
                        }
                }
        }