Commit 589e4aeb authored by Robert Lyon's avatar Robert Lyon
Browse files

Bug 1717371: Upgrade fails from 15.04



Due to missing column 'logoxs' as this column has not been added yet

behatnotneeded

Change-Id: Ie744485923c1566f10081ab98f16a1e2b08baf5a
Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
parent 1a08d9d2
......@@ -1800,7 +1800,8 @@ function load_user_institutions($userid) {
if (!is_numeric($userid) || $userid < 0) {
throw new InvalidArgumentException("couldn't load institutions, no user id specified");
}
if ($institutions = get_records_sql_assoc('
$userid = (int) $userid;
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
FROM {usr_institution} u INNER JOIN {institution} i ON u.institution = i.name
WHERE u.usr = ? ORDER BY i.priority DESC', array($userid))) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment