From 125d80292b9521f9a0db717583f13810634149b9 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 12 Jun 2016 23:06:48 +0200 Subject: [PATCH] Some cleanup --- include/conversation.php | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index ac0bd69e4c..8f94d96301 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -394,23 +394,13 @@ function contact_condition() { return $condition; } -/** - * @brief SQL condition for items - */ -function item_condition() { - - $condition = "`item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`"; - - return $condition; -} - /** * @brief List of all item fields that are needed for the conversation function */ function item_fieldlist() { $fieldlist = "`item`.`author-link`, `item`.`verb`, `item`.`id`, `item`.`parent`, - `item`.`uid`, `item`.`author-name`, `item`.`tag`, `item`.`location`, `item`.`coord`, + `item`.`uid`, `item`.`author-name`, `item`.`location`, `item`.`coord`, `item`.`title`, `item`.`uri`, `item`.`created`, `item`.`app`, `item`.`guid`, `item`.`contact-id`, `item`.`thr-parent`, `item`.`parent-uri`, `item`.`rendered-hash`, `item`.`body`, `item`.`rendered-html`, `item`.`private`, `item`.`edited`, @@ -423,6 +413,16 @@ function item_fieldlist() { return $fieldlist; } +/** + * @brief SQL condition for items + */ +function item_condition() { + + $condition = "`item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`"; + + return $condition; +} + /** * "Render" a conversation or list of items for HTML display. * There are two major forms of display: