From db0b49d47cc5ea3b23134823920d008b20154656 Mon Sep 17 00:00:00 2001 From: Robert Lyon Date: Tue, 31 Oct 2017 20:40:09 +1300 Subject: [PATCH] Bug 1728815: Not include the logoxs column in sql query until it exists As it causes problems on upgrade behatnotneeded Change-Id: Id330f8c31c763dffce6f559557c9c78ac27ac58f Signed-off-by: Robert Lyon (cherry picked from commit 35d46f1d00bb031871f51c951b21df7ef5a379d7) --- htdocs/lib/user.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/htdocs/lib/user.php b/htdocs/lib/user.php index 878af099fe..e55b7b102f 100644 --- a/htdocs/lib/user.php +++ b/htdocs/lib/user.php @@ -1805,8 +1805,16 @@ function load_user_institutions($userid) { throw new InvalidArgumentException("couldn't load institutions, no user id specified"); } $userid = (int) $userid; + + require_once('ddl.php'); + $table = new XMLDBTable('institution'); + $field = new XMLDBField('logoxs'); + $logoxs = field_exists($table, $field) ? ',i.logoxs' : ''; if ($userid !== 0 && $institutions = get_records_sql_assoc(' - SELECT u.institution,'.db_format_tsfield('ctime').','.db_format_tsfield('u.expiry', 'membership_expiry').',u.studentid,u.staff,u.admin,i.displayname,i.theme,i.registerallowed, i.showonlineusers,i.allowinstitutionpublicviews, i.logo, i.logoxs, i.style, i.licensemandatory, i.licensedefault, i.dropdownmenu, i.skins, i.suspended + SELECT u.institution, ' . db_format_tsfield('ctime') . ',' . db_format_tsfield('u.expiry', 'membership_expiry') . ', + u.studentid, u.staff, u.admin, i.displayname, i.theme, i.registerallowed, i.showonlineusers, + i.allowinstitutionpublicviews, i.logo' . $logoxs . ', i.style, i.licensemandatory, i.licensedefault, + i.dropdownmenu, i.skins, i.suspended FROM {usr_institution} u INNER JOIN {institution} i ON u.institution = i.name WHERE u.usr = ? ORDER BY i.priority DESC', array($userid))) { return $institutions; -- GitLab