diff options
| author | zotlabs <mike@macgirvin.com> | 2018-07-04 19:07:52 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-07-04 19:07:52 -0700 |
| commit | bf24a106ce285d2fa9b6afb0c7a65dd14741c48b (patch) | |
| tree | e2a27e9a90e50b755dd03ba32c1bcb488dd91bdf | |
| parent | 1387b88ba491c855e717cd3803dcaaa06901ae95 (diff) | |
| parent | d9ece80fda867768fb3b8de47bf4eb7c3e6108e8 (diff) | |
| download | volse-hubzilla-bf24a106ce285d2fa9b6afb0c7a65dd14741c48b.tar.gz volse-hubzilla-bf24a106ce285d2fa9b6afb0c7a65dd14741c48b.tar.bz2 volse-hubzilla-bf24a106ce285d2fa9b6afb0c7a65dd14741c48b.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
| -rw-r--r-- | Zotlabs/Module/Network.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php index 172157aab..77a08585b 100644 --- a/Zotlabs/Module/Network.php +++ b/Zotlabs/Module/Network.php @@ -480,7 +480,7 @@ class Network extends \Zotlabs\Web\Controller { if($nouveau && $load) { // "New Item View" - show all items unthreaded in reverse created date order - $items = q("SELECT item.*, item.id AS item_id, received FROM item + $items = q("SELECT item.*, item.id AS item_id, created FROM item left join abook on ( item.owner_xchan = abook.abook_xchan $abook_uids ) $net_query WHERE true $uids $item_normal @@ -488,7 +488,7 @@ class Network extends \Zotlabs\Web\Controller { $simple_update $sql_extra $sql_options $sql_nets $net_query2 - ORDER BY item.received DESC $pager_sql " + ORDER BY item.created DESC $pager_sql " ); require_once('include/items.php'); |