Fix for error in delete function, improved query for community.
This commit is contained in:
parent
1a0a80c310
commit
2ac42036fb
2 changed files with 11 additions and 4 deletions
|
@ -17,7 +17,11 @@ function add_thread($itemid) {
|
||||||
|
|
||||||
logger("add_thread: Add thread for item ".$itemid." - ".print_r($result, true), LOGGER_DEBUG);
|
logger("add_thread: Add thread for item ".$itemid." - ".print_r($result, true), LOGGER_DEBUG);
|
||||||
|
|
||||||
// Adding a shadow item entry
|
// Store a shadow copy of public items for displaying a global community page?
|
||||||
|
if (!get_config('system', 'global_community'))
|
||||||
|
return;
|
||||||
|
|
||||||
|
// is it already a copy?
|
||||||
if (($itemid == 0) OR ($item['uid'] == 0))
|
if (($itemid == 0) OR ($item['uid'] == 0))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
@ -139,7 +143,7 @@ function delete_thread($itemid) {
|
||||||
|
|
||||||
logger("delete_thread: Deleted thread for item ".$itemid." - ".print_r($result, true), LOGGER_DEBUG);
|
logger("delete_thread: Deleted thread for item ".$itemid." - ".print_r($result, true), LOGGER_DEBUG);
|
||||||
|
|
||||||
if ($count($item)) {
|
if (count($item)) {
|
||||||
$r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' AND NOT (`uid` IN (%d, 0))",
|
$r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' AND NOT (`uid` IN (%d, 0))",
|
||||||
dbesc($item["uri"]),
|
dbesc($item["uri"]),
|
||||||
intval($item["uid"])
|
intval($item["uid"])
|
||||||
|
|
|
@ -114,7 +114,9 @@ function community_content(&$a, $update = 0) {
|
||||||
}
|
}
|
||||||
|
|
||||||
function community_getitems($start, $itemspage) {
|
function community_getitems($start, $itemspage) {
|
||||||
// Work in progress return(community_getpublicitems($start, $itemspage));
|
// Work in progress
|
||||||
|
if (get_config('system', 'global_community'))
|
||||||
|
return(community_getpublicitems($start, $itemspage));
|
||||||
|
|
||||||
$r = q("SELECT `item`.`uri`, `item`.*, `item`.`id` AS `item_id`,
|
$r = q("SELECT `item`.`uri`, `item`.*, `item`.`id` AS `item_id`,
|
||||||
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `contact`.`rel`,
|
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `contact`.`rel`,
|
||||||
|
@ -143,12 +145,13 @@ function community_getpublicitems($start, $itemspage) {
|
||||||
$r = q("SELECT `item`.`uri`, `item`.*, `item`.`id` AS `item_id`,
|
$r = q("SELECT `item`.`uri`, `item`.*, `item`.`id` AS `item_id`,
|
||||||
`author-name` AS `name`, `owner-avatar` AS `photo`,
|
`author-name` AS `name`, `owner-avatar` AS `photo`,
|
||||||
`owner-link` AS `url`, `owner-avatar` AS `thumb`
|
`owner-link` AS `url`, `owner-avatar` AS `thumb`
|
||||||
FROM `item` WHERE `item`.`uid` = 0 AND `network` IN ('%s', '%s')
|
FROM `item` WHERE `item`.`uid` = 0 AND `network` IN ('%s', '%s', '%s')
|
||||||
AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = ''
|
AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = ''
|
||||||
AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = ''
|
AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = ''
|
||||||
ORDER BY `item`.`received` DESC LIMIT %d, %d",
|
ORDER BY `item`.`received` DESC LIMIT %d, %d",
|
||||||
dbesc(NETWORK_DFRN),
|
dbesc(NETWORK_DFRN),
|
||||||
dbesc(NETWORK_DIASPORA),
|
dbesc(NETWORK_DIASPORA),
|
||||||
|
dbesc(NETWORK_OSTATUS),
|
||||||
intval($start),
|
intval($start),
|
||||||
intval($itemspage)
|
intval($itemspage)
|
||||||
);
|
);
|
||||||
|
|
Loading…
Reference in a new issue