Merge branch 'wip-mdl-36238' of git://github.com/rajeshtaneja/moodle

This commit is contained in:
Sam Hemelryk 2012-11-28 11:41:42 +13:00
commit 6167badf62

View file

@ -125,6 +125,11 @@ if (!empty($page)) {
$stradministration = get_string('administration');
$strreports = get_string('reports');
// Before we close session, make sure we have editing information in session.
$adminediting = optional_param('adminedit', -1, PARAM_BOOL);
if ($PAGE->user_allowed_editing() && $adminediting != -1) {
$USER->editing = $adminediting;
}
session_get_instance()->write_close();
if (!empty($chooselog)) {