The content generation for the display page is now using a centralized function ...

* The content generation for the display page is now using a centralized function

* Small correction to avoid notices

diff --git a/include/conversation.php b/include/conversation.php
index db14558..90b5da5 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -499,6 +499,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
                                . "; var netargs = '/?f='; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
                }
        } elseif ($mode === 'display') {
+               $items = conversation_add_children($items, false, $order, $uid);
                $profile_owner = $a->profile['uid'];
 
                if (!$update) {

diff --git a/mod/display.php b/mod/display.php
index 2d32eed..907bf8e 100644 (file)
--- a/mod/display.php
+++ b/mod/display.php
@@ -333,35 +333,34 @@ function display_content(App $a, $update = false, $update_uid = 0)
                return '';
        }
 
-       $condition = ["`item`.`parent-uri` = (SELECT `parent-uri` FROM `item` WHERE `id` = ?)
-               AND `item`.`uid` IN (0, ?) " . $sql_extra, $item_id, local_user()];
-       $params = ['order' => ['uid', 'parent' => true, 'gravity', 'id']];
-       $items_obj = Item::selectForUser(local_user(), [], $condition, $params);
+       $condition = ["`id` = ? AND `item`.`uid` IN (0, ?) " . $sql_extra, $item_id, local_user()];
+       $fields = ['parent-uri', 'body', 'title', 'author-name', 'author-avatar', 'plink'];
+       $item = Item::selectFirstForUser(local_user(), $fields, $condition);
 
-       if (!DBA::isResult($items_obj)) {
+       if (!DBA::isResult($item)) {
                notice(L10n::t('Item not found.') . EOL);
                return $o;
        }
 
+       $item['uri'] = $item['parent-uri'];
+
        if ($unseen) {
                $condition = ['parent-uri' => $item_parent_uri, 'uid' => local_user(), 'unseen' => true];
                Item::update(['unseen' => false], $condition);
        }
 
-       $items = Item::inArray($items_obj);
-       $conversation_items = conv_sort($items, "`commented`");
-
        if (!$update) {
                $o .= "<script> var netargs = '?f=&item_id=" . $item_id . "'; </script>";
        }
-       $o .= conversation($a, $conversation_items, 'display', $update_uid, false, 'commented', local_user());
+
+       $o .= conversation($a, [$item], 'display', $update_uid, false, 'commented', local_user());
 
        // Preparing the meta header
-       $description = trim(HTML::toPlaintext(BBCode::convert($items[0]["body"], false), 0, true));
-       $title = trim(HTML::toPlaintext(BBCode::convert($items[0]["title"], false), 0, true));
-       $author_name = $items[0]["author-name"];
+       $description = trim(HTML::toPlaintext(BBCode::convert($item["body"], false), 0, true));
+       $title = trim(HTML::toPlaintext(BBCode::convert($item["title"], false), 0, true));
+       $author_name = $item["author-name"];
 
-       $image = $a->remove_baseurl($items[0]["author-avatar"]);
+       $image = $a->remove_baseurl($item["author-avatar"]);
 
        if ($title == "") {
                $title = $author_name;
@@ -393,7 +392,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
        $a->page['htmlhead'] .= '<meta name="twitter:title" content="'.$title.'" />'."\n";
        $a->page['htmlhead'] .= '<meta name="twitter:description" content="'.$description.'" />'."\n";
        $a->page['htmlhead'] .= '<meta name="twitter:image" content="'.System::baseUrl().'/'.$image.'" />'."\n";
-       $a->page['htmlhead'] .= '<meta name="twitter:url" content="'.$items[0]["plink"].'" />'."\n";
+       $a->page['htmlhead'] .= '<meta name="twitter:url" content="'.$item["plink"].'" />'."\n";
 
        // Dublin Core
        $a->page['htmlhead'] .= '<meta name="DC.title" content="'.$title.'" />'."\n";
@@ -403,7 +402,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
        $a->page['htmlhead'] .= '<meta property="og:type" content="website" />'."\n";
        $a->page['htmlhead'] .= '<meta property="og:title" content="'.$title.'" />'."\n";
        $a->page['htmlhead'] .= '<meta property="og:image" content="'.System::baseUrl().'/'.$image.'" />'."\n";
-       $a->page['htmlhead'] .= '<meta property="og:url" content="'.$items[0]["plink"].'" />'."\n";
+       $a->page['htmlhead'] .= '<meta property="og:url" content="'.$item["plink"].'" />'."\n";
        $a->page['htmlhead'] .= '<meta property="og:description" content="'.$description.'" />'."\n";
        $a->page['htmlhead'] .= '<meta name="og:article:author" content="'.$author_name.'" />'."\n";
        // article:tag