@@ -882,7 +882,8 @@ function questionnaire_get_recent_mod_activity(&$activities, &$index, $timestart
882882 $ params ['timestart ' ] = $ timestart ;
883883 $ params ['questionnaireid ' ] = $ questionnaire ->id ;
884884
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 ;
886887 if (!$ attempts = $ DB ->get_records_sql ("
887888 SELECT qr.*,
888889 {$ ufields }
@@ -956,7 +957,10 @@ function questionnaire_get_recent_mod_activity(&$activities, &$index, $timestart
956957 $ tmpactivity ->content = new stdClass ();
957958 $ tmpactivity ->content ->attemptid = $ attempt ->id ;
958959
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 );
960964 $ tmpactivity ->user = new stdClass ();
961965 foreach ($ userfields as $ userfield ) {
962966 if ($ userfield == 'id ' ) {
0 commit comments