@@ -882,7 +882,8 @@ function questionnaire_get_recent_mod_activity(&$activities, &$index, $timestart
882
882
$ params ['timestart ' ] = $ timestart ;
883
883
$ params ['questionnaireid ' ] = $ questionnaire ->id ;
884
884
885
- $ ufields = user_picture::fields ('u ' , null , 'useridagain ' );
885
+ $ userfieldsapi = \core_user \fields::for_userpic ();
886
+ $ ufields = $ userfieldsapi ->get_sql ('u ' , false , '' , 'useridagain ' , false )->selects ;
886
887
if (!$ attempts = $ DB ->get_records_sql ("
887
888
SELECT qr.*,
888
889
{$ ufields }
@@ -956,7 +957,10 @@ function questionnaire_get_recent_mod_activity(&$activities, &$index, $timestart
956
957
$ tmpactivity ->content = new stdClass ();
957
958
$ tmpactivity ->content ->attemptid = $ attempt ->id ;
958
959
959
- $ userfields = explode (', ' , user_picture::fields ());
960
+ $ userfieldsapi = \core_user \fields::for_userpic ();
961
+ $ allnamefields = $ userfieldsapi ->get_sql ('' , false , '' , '' , false )->selects ;
962
+ $ selects = str_replace (', ' , ', ' , $ allnamefields );
963
+ $ userfields = explode (', ' , $ selects );
960
964
$ tmpactivity ->user = new stdClass ();
961
965
foreach ($ userfields as $ userfield ) {
962
966
if ($ userfield == 'id ' ) {
0 commit comments