composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-24 02:58:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/support/2.7' into develop

Browse Source
This commit is contained in:
Pierre Goiffon
2020-04-20 16:08:15 +02:00
parent 24130dd94f db593ff85e
commit 8de4c0360d
54 changed files with 302 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
setup/moduleinstaller.class.inc.php
View File

@@ -147,6 +147,12 @@ abstract class ModuleInstallerAPI
{
$aCurrentValues = explode("','", $aMatches[1]);
}
else
{
// not an enum currently : return !
// we could update values, but a clear error message will be displayed when altering the column
return;
}
}
if (!in_array($sFrom, $aNewValues))
{

1
setup/setuputils.class.inc.php
View File

@@ -113,6 +113,7 @@ class SetupUtils
'openssl' => 'Strong encryption will not be used.',
),
'ldap' => 'LDAP authentication will be disabled.',
'mbstring' => 'For CryptEngine implementations, trace in Mail to ticket automation', // N°2891
);
asort($aMandatoryExtensions); // Sort the list to look clean !

2
setup/wizardsteps.class.inc.php
View File

@@ -658,7 +658,7 @@ EOF
if ($oMutex->IsLocked())
{
$oPage->add(<<<HTML
<div class="message">An iTop CRON process is being executed on the target database. iTop CRON process will be stopped during the setup execution.</div>
<div class="message">An iTop cron process is being executed on the target database. iTop cron process will be stopped during the setup execution.</div>
HTML
);
}