Ignore:
Timestamp:
Mar 28, 2014, 2:26:30 PM (10 years ago)
Author:
plg
Message:

merge r27996 from branch 2.6 to trunk

bug 3065 fixed: avoid SQL errors with external authentication

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/functions_mail.inc.php

    r27403 r27997  
    441441    AND u.'.$conf['user_fields']['email'].' IS NOT NULL
    442442    AND i.user_id <> '.$user['id'].'
    443   ORDER BY username
     443  ORDER BY name
    444444;';
    445445  $admins = array_from_query($query);
Note: See TracChangeset for help on using the changeset viewer.