Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

2018-02-11 19:36:37 -08:00
parent 63107f5b2f ba954b8cfe
commit 0f8d2d4e58
25 changed files with 516 additions and 405 deletions
--- a/include/items.php
+++ b/include/items.php
@@ -3467,7 +3467,7 @@ function item_expire($uid,$days) {
 		AND item_thread_top = 1
 		AND resource_type = ''
 		AND item_starred = 0
-		$sql_extra $item_normal LIMIT $expire_limit ",
+		$sql_extra $item_normal ORDER BY created ASC LIMIT $expire_limit ",
 		intval($uid),
 		db_utcnow(),
 		db_quoteinterval(intval($days).' DAY')