Merge branch 'fixes/poller-warning' into rhaeder-develop

[friendica.git] / mod / display.php

diff --git a/mod/display.php b/mod/display.php
index 9995a2b3efc2c0e0587a37d0dd2d1ca05b3c81e7..97261e267d659bc882eede5e00ea313ccc571581 100644 (file)
--- a/mod/display.php
+++ b/mod/display.php
@@ -1,5 +1,5 @@
 <?php
-if(! function_exists('display_init')) {
+
 function display_init(&$a) {
 
        if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
@@ -85,10 +85,9 @@ function display_init(&$a) {
        }
 
        profile_load($a, $nick, 0, $profiledata);
-}
+
 }
 
-if(! function_exists('display_fetchauthor')) {
 function display_fetchauthor($a, $item) {
 
        $profiledata = array();
@@ -221,9 +220,7 @@ function display_fetchauthor($a, $item) {
 
        return($profiledata);
 }
-}
 
-if(! function_exists('display_content')) {
 function display_content(&$a, $update = 0) {
 
        if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
@@ -350,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,
@@ -369,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);
 
@@ -525,4 +519,4 @@ function display_content(&$a, $update = 0) {
 
        return $o;
 }
-}
+