From 393b1b38ef0b639357d4c9d6df9eed8362da8f8a Mon Sep 17 00:00:00 2001 From: plegall Date: Fri, 28 Mar 2014 13:26:30 +0000 Subject: merge r27996 from branch 2.6 to trunk bug 3065 fixed: avoid SQL errors with external authentication git-svn-id: http://piwigo.org/svn/trunk@27997 68402e56-0260-453c-a942-63ccdbb3a9ee --- include/functions_mail.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/functions_mail.inc.php') diff --git a/include/functions_mail.inc.php b/include/functions_mail.inc.php index e40e94b55..8b93afdfe 100644 --- a/include/functions_mail.inc.php +++ b/include/functions_mail.inc.php @@ -440,7 +440,7 @@ SELECT WHERE i.status in (\'webmaster\', \'admin\') AND u.'.$conf['user_fields']['email'].' IS NOT NULL AND i.user_id <> '.$user['id'].' - ORDER BY username + ORDER BY name ;'; $admins = array_from_query($query); -- cgit v1.2.3