harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #790 from pafcu/sortnotifications

Browse Source 
Sort notifications
This commit is contained in:
pafcu 2014-12-30 22:39:31 +02:00
commit 3096ae43c3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mod/ping.php
View File

@ -277,7 +277,7 @@ function ping_init(&$a) {
$r = q("SELECT * FROM item $r = q("SELECT * FROM item
WHERE item_restrict = %d and ( item_flags & %d ) > 0 and uid = %d 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_VISIBLE),
intval(ITEM_UNSEEN), intval(ITEM_UNSEEN),
intval(local_user()), intval(local_user()),
@ -300,7 +300,7 @@ function ping_init(&$a) {
if(argc() > 1 && (argv(1) === 'intros')) { if(argc() > 1 && (argv(1) === 'intros')) {
$result = array(); $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(local_user()),
intval(ABOOK_FLAG_PENDING), intval(ABOOK_FLAG_PENDING),
intval(ABOOK_FLAG_SELF|ABOOK_FLAG_IGNORED), intval(ABOOK_FLAG_SELF|ABOOK_FLAG_IGNORED),