[ticket/13713] Fix ORDER_BY in queries

PHPBB3-13713
This commit is contained in:
lavigor 2018-08-03 06:43:27 +03:00 committed by Marc Alexander
parent a8cb12e455
commit 5651c7f3ff
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
3 changed files with 3 additions and 1 deletions

View file

@ -39,6 +39,7 @@ class group extends base_group
'FROM' => [ 'FROM' => [
GROUPS_TABLE => 'g', GROUPS_TABLE => 'g',
], ],
'ORDER_BY' => 'g.group_name',
]); ]);
return $query; return $query;
} }

View file

@ -37,7 +37,7 @@ class team extends base_user
], ],
'WHERE' => 'ug.group_id = t.group_id AND ug.user_id = u.user_id AND ug.user_pending = 0 'WHERE' => 'ug.group_id = t.group_id AND ug.user_id = u.user_id AND ug.user_pending = 0
AND ' . $this->db->sql_in_set('u.user_type', [USER_NORMAL, USER_FOUNDER]), AND ' . $this->db->sql_in_set('u.user_type', [USER_NORMAL, USER_FOUNDER]),
'ORDER_BY' => 'u.user_lastvisit DESC' 'ORDER_BY' => 'u.username'
]); ]);
return $query; return $query;
} }

View file

@ -32,6 +32,7 @@ class usergroup extends base_group
] ]
], ],
'WHERE' => 'ug.user_pending = 0 AND ug.user_id = ' . (int) $this->user->data['user_id'], 'WHERE' => 'ug.user_pending = 0 AND ug.user_id = ' . (int) $this->user->data['user_id'],
'ORDER_BY' => 'g.group_name',
]); ]);
return $query; return $query;
} }