diff options
| author | friendica <info@friendica.com> | 2014-12-30 15:25:06 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-12-30 15:25:06 -0800 |
| commit | abd345f80f5074d325fd137e48a23925eaa66802 (patch) | |
| tree | c5a469a001b2eb9ae5482b93b557a42e3181208f /mod/ping.php | |
| parent | 2f650b74d35335815c48537cd03c81cc92a3c4f8 (diff) | |
| parent | ae9d08267c632cae36a4ebd34c2077fd0051e0e7 (diff) | |
| download | volse-hubzilla-abd345f80f5074d325fd137e48a23925eaa66802.tar.gz volse-hubzilla-abd345f80f5074d325fd137e48a23925eaa66802.tar.bz2 volse-hubzilla-abd345f80f5074d325fd137e48a23925eaa66802.zip | |
Merge branch 'master' into trinidad
Diffstat (limited to 'mod/ping.php')
| -rw-r--r-- | mod/ping.php | 4 |
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), |