Some cleanup

diff --git a/include/conversation.php b/include/conversation.php
index ac0bd69e4ce109fbc7f6205291988f4a5dab72e5..8f94d96301653094f46f70e82655f4e3d013b331 100644 (file)
--- 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: