Commit 337ccd0e authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review

Merge "Bug 1654894: Institution defaultmembershipperiod being set to 0" into 15.10_STABLE

parents 84e9f0ee a54fedef
......@@ -44,7 +44,7 @@ class Institution {
'registerallowed' => 0,
'registerconfirm' => 1,
'theme' => null,
'defaultmembershipperiod' => 0,
'defaultmembershipperiod' => null,
'maxuseraccounts' => null,
'expiry' => null,
'expirymailsent' => 0,
......@@ -131,11 +131,13 @@ class Institution {
break;
case 'id':
case 'defaultmembershipperiod':
case 'maxuseraccounts':
case 'showonlineusers':
$value = (int) $value;
break;
case 'defaultmembershipperiod':
$value = is_null($value) ? null : (int) $value;
break;
}
if (array_key_exists($name, self::$dbfields)) {
......
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