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

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

Browse Source 
# Conflicts:
#	core/config.class.inc.php
#	setup/itopdesignformat.class.inc.php
This commit is contained in:
Molkobain
2022-01-27 16:09:22 +01:00
parent 44c18395b3 b89d181125
commit 3bec96abe1
102 changed files with 986 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/log.class.inc.php
View File

@@ -1154,7 +1154,12 @@ class DeprecatedCallsLog extends LogAPI
*/
public static function NotifyDeprecatedFile(?string $sAdditionalMessage = null): void
{
if (!static::IsLogLevelEnabled(self::LEVEL_WARNING, self::ENUM_CHANNEL_FILE)) {
try {
if (!static::IsLogLevelEnabled(self::LEVEL_WARNING, self::ENUM_CHANNEL_FILE)) {
return;
}
}
catch (ConfigException $e) {
return;
}
@@ -1213,7 +1218,7 @@ class DeprecatedCallsLog extends LogAPI
$sMessage .= ' : '.$sAdditionalMessage;
}
static::Warning($sMessage, self::ENUM_CHANNEL_PHP_METHOD);
static::Warning($sMessage, self::ENUM_CHANNEL_P&HP_METHOD);
}
/**