You'd think this would never happen, but it can if a page is defined as PUBLIC and has the sideblock on it.

Throw SystemExceptions rather than Exceptions when files can't be found to be included in safe_require.

When adding blogpost attachments, upload & browse defaults to the home folder instead of the 'blogfiles' folder

(cherry picked from commit a9823b6b)

This is the #1 cause of Fatal Errors in Mahara - when a second exception (usually an SQLException) is thrown while we're in the middle of handling one already.

Now the first exception gets to follow through to its conclusion, which results in far better error messages.

This will make it easier to debug such problems in the future.
(cherry picked from commit 8c869919)

Force profileicon upgrade to fail if dataroot/artefact/file/profileicons directory exists; don't try to delete profileicon artefacts without files on disk

Change user message notification url to allow replies
Quote original message when sending a user message as a reply

Rename relevant elements from institutionexpiry... to institutionmembershipexpiry... to avoid naming clash.

(cherry picked from commit 30438e42)

Conflicts:

	htdocs/lib/version.php