Tim Hunt authored Jul 02, 2014 and Dan Poltawski committed Jul 02, 2014

I have done this by eliminating the duplication between the base class
and the subclass.

This was a regression introdcued by MDL-40313.

It seems that redirect (after reset button) was also
missing the userid so the user track was lost.

Merge branch 'MDL-46163_category_selector_renders_as_nested_form' of https://github.com/MorrisR2/moodle

Conflicts:
	lib/db/upgrade.php
	version.php

Damyon Wiese authored Jun 26, 2014 and Marina Glancy committed Jul 01, 2014

This is a big win in a specific situation, ie filters enabled for content+headings,
and no activity descriptions visible on the course page.

This reverses the references used for global $USER and $SESSION,
the reason is that PHP does not allow references to references.
$USER is a reference to $GLOBALS['USER'] which means we cannot
put any references to it. Solution is to store the current user and session
objects in $GLOBALS['USER'] and $GLOBALS['SESSIOn'] are reference
them in $_SESSION.

This patch makes the session code behave the same way in CLI,
phpunit and normal web requests - this allows use to finally
unit test most aspects of the session code in Moodle.