aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2014-03-28 13:26:30 +0000
committerplegall <plg@piwigo.org>2014-03-28 13:26:30 +0000
commit393b1b38ef0b639357d4c9d6df9eed8362da8f8a (patch)
treef157180715dff3a57a2f7a791393e87f37101598 /include
parent4b7102bd45e3d8394ac02af3ef49ec9b416bc80b (diff)
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
Diffstat (limited to 'include')
-rw-r--r--include/functions_mail.inc.php2
1 files changed, 1 insertions, 1 deletions
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);