Merge branch 'MDL-43451-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE

2014-01-07 23:38:28 +01:00
parent d829440fed 560672aaa1
commit f0d61c012d
1 changed files with 3 additions and 2 deletions
@@ -223,8 +223,9 @@ function cron_run() {
    // Generate new password emails for users - ppl expect these generated asap
    if ($DB->count_records('user_preferences', array('name'=>'create_password', 'value'=>'1'))) {
        mtrace('Creating passwords for new users...');
-        $newusers = $DB->get_recordset_sql("SELECT u.id as id, u.email, u.firstname,
-                                                 u.lastname, u.username, u.lang,
+        $usernamefields = get_all_user_name_fields(true, 'u');
+        $newusers = $DB->get_recordset_sql("SELECT u.id as id, u.email,
+                                                 $usernamefields, u.username, u.lang,
                                                 p.id as prefid
                                            FROM {user} u
                                            JOIN {user_preferences} p ON u.id=p.userid