aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpafcu <pafcu@iki.fi>2014-12-30 22:39:31 +0200
committerpafcu <pafcu@iki.fi>2014-12-30 22:39:31 +0200
commit3096ae43c35d14e02d9f08238aeb726920df8c2f (patch)
tree5ac7f24eae0f45660206b82e9be5037cf6e5045d
parent4edc9a696bf0b7d84f2f7d8caa1b5d95902cf09f (diff)
parent2710510392f64cfbc0be929d4ff9d607025d80bf (diff)
downloadvolse-hubzilla-3096ae43c35d14e02d9f08238aeb726920df8c2f.tar.gz
volse-hubzilla-3096ae43c35d14e02d9f08238aeb726920df8c2f.tar.bz2
volse-hubzilla-3096ae43c35d14e02d9f08238aeb726920df8c2f.zip
Merge pull request #790 from pafcu/sortnotifications
Sort notifications
-rw-r--r--mod/ping.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/mod/ping.php b/mod/ping.php
index cdb6aa0b2..593ae21f8 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -277,7 +277,7 @@ function ping_init(&$a) {
$r = q("SELECT * FROM item
WHERE item_restrict = %d and ( item_flags & %d ) > 0 and uid = %d
- and author_xchan != '%s' ",
+ and author_xchan != '%s' ORDER BY created DESC",
intval(ITEM_VISIBLE),
intval(ITEM_UNSEEN),
intval(local_user()),
@@ -300,7 +300,7 @@ function ping_init(&$a) {
if(argc() > 1 && (argv(1) === 'intros')) {
$result = array();
- $r = q("SELECT * FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and (abook_flags & %d) > 0 and not ((abook_flags & %d) > 0 or (xchan_flags & %d) > 0)",
+ $r = q("SELECT * FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and (abook_flags & %d) > 0 and not ((abook_flags & %d) > 0 or (xchan_flags & %d) > 0) ORDER BY abook_created DESC",
intval(local_user()),
intval(ABOOK_FLAG_PENDING),
intval(ABOOK_FLAG_SELF|ABOOK_FLAG_IGNORED),