jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Some cleanup

Browse source
This commit is contained in:
Michael Vogel 2016-06-12 23:06:48 +02:00
parent c68f28bc77
commit 125d80292b
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
include/conversation.php
View file

@ -394,23 +394,13 @@ function contact_condition() {
return $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 * @brief List of all item fields that are needed for the conversation function
*/ */
function item_fieldlist() { function item_fieldlist() {
$fieldlist = "`item`.`author-link`, `item`.`verb`, `item`.`id`, `item`.`parent`, $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`.`title`, `item`.`uri`, `item`.`created`, `item`.`app`, `item`.`guid`,
`item`.`contact-id`, `item`.`thr-parent`, `item`.`parent-uri`, `item`.`rendered-hash`, `item`.`contact-id`, `item`.`thr-parent`, `item`.`parent-uri`, `item`.`rendered-hash`,
`item`.`body`, `item`.`rendered-html`, `item`.`private`, `item`.`edited`, `item`.`body`, `item`.`rendered-html`, `item`.`private`, `item`.`edited`,
@ -423,6 +413,16 @@ function item_fieldlist() {
return $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. * "Render" a conversation or list of items for HTML display.
* There are two major forms of display: * There are two major forms of display: