Commit 22fdc56d authored by Penny Leach's avatar Penny Leach
Browse files

fixed up the disablelogins code and bumped the version. tag to come as

new minupgradefrom
parent 2c433b6d
......@@ -30,15 +30,17 @@ define('INSTALLER', 1);
require(dirname(dirname(__FILE__)) . '/init.php');
require(get_config('libroot') . 'upgrade.php');
$upgrade = check_upgrades($name);
if (empty($upgrade->disablelogin)) {
auth_setup();
}
$install = param_boolean('install');
if (!$install) {
$name = param_variable('name');
}
$upgrade = check_upgrades($name);
if (empty($upgrade->disablelogin)) {
auth_setup();
}
if ($install) {
$message = '';
if (!get_config('installed')) {
......
......@@ -37,6 +37,7 @@ $upgrades = check_upgrades();
if (empty($upgrades['disablelogin'])) {
auth_setup();
}
unset($upgrades['disablelogin']);
if (!$upgrades) {
die_info(get_string('noupgrades', 'admin'));
......
......@@ -84,6 +84,7 @@ function check_upgrades($name=null) {
// If we were just checking if the core needed to be upgraded, we can stop here
if ($name == 'core') {
$toupgrade['core']->disablelogin = $disablelogin;
return $toupgrade['core'];
}
......
......@@ -27,7 +27,8 @@
defined('INTERNAL') || die();
$config = new StdClass;
$config->version = 2006121500;
$config->version = 2006121501;
$config->release = '0.1';
$config->disablelogin = true;
?>
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