Updating after post does now work

diff --git a/include/conversation.php b/include/conversation.php
index f10279c33356321c913e236cbe1043540716f16f..daee67493bacf88f99db08276cea6c6b8744b0c0 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -611,9 +611,12 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
        $page_template = get_markup_template("conversation.tpl");
 
        if ($items && count($items)) {
-               // Currently disabled. This is a preparation for the ability to comment and share every public item.
-               // $writable = ($items[0]['uid'] == 0) && in_array($items[0]['network'], array(NETWORK_OSTATUS, NETWORK_DIASPORA));
-               $writable = false;
+               // Currently behind a config value. This allows the commenting and sharing of every public item.
+               if (Config::get('system', 'comment_public')) {
+                       $writable = ($items[0]['uid'] == 0) && in_array($items[0]['network'], array(NETWORK_OSTATUS, NETWORK_DIASPORA));
+               } else {
+                       $writable = false;
+               }
 
                if ($mode === 'network-new' || $mode === 'search' || $mode === 'community') {
 

diff --git a/mod/display.php b/mod/display.php
index 158523945a34f6459066e1fdf7a84595022a2f83..012bc5e61a67cdc5732ee18dea3f792bc8d855f5 100644 (file)
--- a/mod/display.php
+++ b/mod/display.php
@@ -205,9 +205,9 @@ function display_fetchauthor($a, $item) {
        return($profiledata);
 }
 
-function display_content(App $a, $update = 0) {
+function display_content(App $a, $update = false, $update_uid = 0) {
 
-       if ((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) {
+       if (Config::get('system','block_public') && !local_user() && !remote_user()) {
                notice(t('Public access denied.') . EOL);
                return;
        }
@@ -227,7 +227,8 @@ function display_content(App $a, $update = 0) {
 
        if ($update) {
                $item_id = $_REQUEST['item_id'];
-               $a->profile = array('uid' => intval($update), 'profile_uid' => intval($update));
+               $item = dba::select('item', ['uid'], ['id' => $item_id], ['limit' => 1]);
+               $a->profile = array('uid' => intval($item['uid']), 'profile_uid' => intval($item['uid']));
        } else {
                $item_id = (($a->argc > 2) ? $a->argv[2] : 0);
 
@@ -347,9 +348,9 @@ function display_content(App $a, $update = 0) {
        if (DBM::is_result($r)) {
                $a->page_contact = $r;
        }
-       $is_owner = ((local_user()) && (local_user() == $a->profile['profile_uid']) ? true : false);
+       $is_owner = (local_user() && (local_user() == $a->profile['profile_uid']) ? true : false);
 
-       if ($a->profile['hidewall'] && (! $is_owner) && (! $remote_contact)) {
+       if ($a->profile['hidewall'] && !$is_owner && !$remote_contact) {
                notice(t('Access to this profile has been restricted.') . EOL);
                return;
        }
@@ -375,10 +376,9 @@ function display_content(App $a, $update = 0) {
        $sql_extra = item_permissions_sql($a->profile['uid'],$remote_contact,$groups);
 
        if ($update) {
-               $r = dba::p("SELECT `id` FROM `item` WHERE `item`.`uid` = ?
-                       AND `item`.`parent` = (SELECT `parent` FROM `item` WHERE `id` = ?)
+               $r = dba::p("SELECT `id` FROM `item` WHERE
+                       `item`.`parent` = (SELECT `parent` FROM `item` WHERE `id` = ?)
                        $sql_extra AND `unseen`",
-                       $a->profile['uid'],
                        $item_id
                );
 
@@ -429,7 +429,7 @@ function display_content(App $a, $update = 0) {
                if (!$update) {
                        $o .= "<script> var netargs = '?f=&nick=" . $nick . "&item_id=" . $item_id . "'; </script>";
                }
-               $o .= conversation($a, $items, 'display', $update);
+               $o .= conversation($a, $items, 'display', $update_uid);
 
                // Preparing the meta header
                require_once('include/bbcode.php');

diff --git a/mod/update_display.php b/mod/update_display.php
index 00109202ed7a9547048ea27dbbc2a9e8f5940698..0fbb3f9428b8497330d1e3911701c29597f9db2b 100644 (file)
--- a/mod/update_display.php
+++ b/mod/update_display.php
@@ -15,7 +15,7 @@ function update_display_content(App $a)
        echo "<!DOCTYPE html><html><body>\r\n";
        echo "<section>";
 
-       $text = display_content($a, $profile_uid);
+       $text = display_content($a, true, $profile_uid);
        $pattern = "/<img([^>]*) src=\"([^\"]*)\"/";
        $replace = "<img\${1} dst=\"\${2}\"";
        $text = preg_replace($pattern, $replace, $text);