Institution privacy statement and T&C created during upgrade though no custom statements before

[Kristina Hoeppner]

Mahara 18.04 master

To replicate:

1. Set up a Mahara 17.10 with 2 institutions and custom site T&C and privacy statement.
2. Institution A has privacy statement and terms and conditions that are different from the site. Institution B uses the site terms and conditions and privacy statement, i.e. leaves the switch on "Yes" for "Use site defaults" at /admin/users/institutionpages.php
3. Upgrade the site to master.

Expected results:

a) The site T&C and privacy statement are transferred correctly and there per default.
b) Institution A has custom institution T&C and privacy statement.
c) Institution B does not have any privacy statement and T&C listed, but could set them up.

Actual results:

a) Passed
b) Passed
c) A privacy statement and T&C default text is displayed and thus there is a version in there though there shouldn't be as we can't delete it.

It works correctly when you set up a fresh DB with 18.04, just not for the ugprade.

[Kristina Hoeppner (kris-hoeppner)]

17.10 database with the setup described in the bug report

[Kristina Hoeppner (kris-hoeppner)]

Database upgraded to master exhibiting the reported behavior.

[Mahara Bot (dev-mahara)]

Patch for "master" branch: https://reviews.mahara.org/8555

[Mahara Bot (dev-mahara)]

Reviewed: https://reviews.mahara.org/8555
Committed: https://git.mahara.org/mahara/mahara/commit/94b4850211a8ed1c388aa67afe1ee9b201c16b2e
Submitter: Robert Lyon (<email address hidden>)
Branch: master

commit 94b4850211a8ed1c388aa67afe1ee9b201c16b2e
Author: Maria Sorica <email address hidden>
Date: Wed Feb 28 17:30:40 2018 +0000

Bug1751931: For institutions, keep just custom T&C/PS on update

If an institution uses the site T&C and/or privacy statement
as it's own, when the site is upgraded to the 18.04 version,
the institution no longer has any T&C/PS.

If an institution uses its own T&C and/or privacy statement,
when the site is upgraded to the 18.04 version, the custom
items are not deleted but remain the current T&C/PS
for that institution.

Note: If the institution had custom T&C/PS but switched
back to using the site T&C/PS, when the upgrade is done
the custom T&C and/or PS are deleted form the DB.

behatnotneeded

Change-Id: Ib54c39bd8e4cf0b238268387a78f7a056a24a856