Commit 401153f2 authored by Côme Chilliet's avatar Côme Chilliet

Merge branch '2895-add-support-for-paginating-ldap-result-in-setup' into '1.4-dev'

Resolve "Add support for paginating ldap result in setup"

See merge request fusiondirectory/fd!693
parents 2af8ee17 ad8e096c
......@@ -119,13 +119,13 @@ class setupStepConfig extends configInLdap
msg_dialog::displayChecks($errors);
return;
}
/* Reload config from LDAP */
$config->set_current($config->current['NAME']);
/* Insert default config values, even for installed plugin */
session::un_set('plist');
pluglist::load();
/* Insert default config values, even for installed plugin */
$config->loadPlist($plist);
$config->checkLdapConfig(TRUE);
/* Reload config from LDAP */
$config->set_current($config->current['NAME']);
/* Set as completed and reload step */
$this->is_completed = TRUE;
$this->parent->reBuildConfigStep(TRUE);
......
......@@ -297,6 +297,9 @@ class setupStepMigrate extends setupStep
function execute (): string
{
if (ini_get('max_execution_time') < 180) {
set_time_limit(180);
}
if (empty($this->checks) || isset($_POST['reload'])) {
$this->initialize_checks();
foreach ($this->checks as $check) {
......@@ -308,6 +311,9 @@ class setupStepMigrate extends setupStep
function save_object ()
{
if (ini_get('max_execution_time') < 180) {
set_time_limit(180);
}
$this->is_completed = TRUE;
parent::save_object();
foreach ($this->checks as $check) {
......
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