Merge remote-tracking branch 'upstream/develop' into 1603-ostatus-completion

[friendica.git] / mod / display.php

diff --git a/mod/display.php b/mod/display.php
index ca57af923332e8bad1d51534e1ed41deeb02249f..97261e267d659bc882eede5e00ea313ccc571581 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"];
                        }
                }
        }
@@ -340,10 +347,8 @@ function display_content(&$a, $update = 0) {
                return;
        }
 
-       // Why do we need this on the display page? We don't have the possibility to write new content here.
-       // Ad editing of posts work without this as well.
-       // We should remove this completely for the 3.5.1 release.
-       /*
+       // We need the editor here to be able to reshare an item.
+
        if ($is_owner) {
                $x = array(
                        'is_owner' => true,
@@ -359,7 +364,6 @@ function display_content(&$a, $update = 0) {
                );
                $o .= status_editor($a,$x,0,true);
        }
-       */
 
        $sql_extra = item_permissions_sql($a->profile['uid'],$remote_contact,$groups);