Commit feca5afa authored by Mario's avatar Mario
Browse files

Merge branch 'dev' of https://framagit.org/hubzilla/core into dev

parents 9cb5274d 2870fd46
Pipeline #446498 passed with stage
in 2 minutes and 45 seconds
......@@ -4217,6 +4217,9 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C
$item_uids = " item.uid = " . intval($uid) . " ";
}
if($arr['top'])
$sql_options .= " and item_thread_top = 1 ";
if($arr['star'])
$sql_options .= " and item_starred = 1 ";
......@@ -4372,7 +4375,7 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C
if ($arr['total']) {
$items = dbq("SELECT count(item.id) AS total FROM item
WHERE $item_uids $item_restrict
$simple_update
$simple_update $sql_options
$sql_extra $sql_nets $sql_extra3"
);
if ($items) {
......@@ -4383,7 +4386,7 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C
$items = dbq("SELECT item.*, item.id AS item_id FROM item
WHERE $item_uids $item_restrict
$simple_update
$simple_update $sql_options
$sql_extra $sql_nets $sql_extra3
ORDER BY item.received DESC $pager_sql"
);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment