From 70108744d4f421aed03118e23dbd35861e358e56 Mon Sep 17 00:00:00 2001
From: Dan Marsden <dan@danmarsden.com>
Date: Tue, 17 Aug 2021 14:48:40 +1200
Subject: [PATCH] Fix #546 - don't include custom fields. also fix github
 action config var.

---
 .github/workflows/moodle-release.yml | 2 +-
 classes/structure.php                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/moodle-release.yml b/.github/workflows/moodle-release.yml
index 46380e3..932653e 100644
--- a/.github/workflows/moodle-release.yml
+++ b/.github/workflows/moodle-release.yml
@@ -121,7 +121,7 @@ jobs:
           FUNCTION: local_plugins_add_version
 
         run: |
-          ZIPURL="https://github.com/danmarsden/moodle-mod_attendance/archive/refs/heads/{BRANCH}.zip"
+          ZIPURL="https://github.com/danmarsden/moodle-mod_attendance/archive/refs/heads/${BRANCH}.zip"
           RESPONSE=$(${CURL} ${ENDPOINT} --data-urlencode "wstoken=${TOKEN}" \
                                          --data-urlencode "wsfunction=${FUNCTION}" \
                                          --data-urlencode "moodlewsrestformat=json" \
diff --git a/classes/structure.php b/classes/structure.php
index bd03cee..145b0d1 100644
--- a/classes/structure.php
+++ b/classes/structure.php
@@ -805,7 +805,7 @@ class mod_attendance_structure {
         global $DB;
 
         $fields = array('username' , 'idnumber' , 'institution' , 'department', 'city', 'country');
-        $userf = \core_user\fields::for_identity($this->context)->with_userpic()->including(...$fields);
+        $userf = \core_user\fields::for_identity($this->context, false)->with_userpic()->including(...$fields);
         $userfields = $userf->get_sql('u', false, '', 'id', false)->selects;
 
         if (empty($this->pageparams->sort)) {