Commit 20ecaa1c authored by Nigel McNie's avatar Nigel McNie Committed by Nigel McNie

Move ensure_sanity call to just after where the file it is in is included,

to get the sanity checks done as soon as possible.

Include the auth page, but only after we know what theme we are supposed to
use, which allows drawing of correct login boxes.
parent 68c03b72
......@@ -67,11 +67,11 @@ if (!isset($CFG->wwwroot)) {
// core libraries
require('mahara.php');
ensure_sanity();
require('dml.php');
require('constants.php');
require('web.php');
require('session.php');
ensure_sanity();
// Database access functions
require('adodb/adodb-exceptions.inc.php');
......@@ -119,4 +119,9 @@ if (!get_config('theme')) {
$CFG->themeurl = get_config('wwwroot') . 'theme/' . get_config('theme') . '/static/';
// Only do authentication once we know the page theme, so that the login form
// can have the correct theming.
require('auth.php');
auth_setup();
?>
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