composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-12 23:14:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/support/3.1' into support/3.2

Browse Source 
# Conflicts:
#	.make/composer/rmDeniedTestDir.php
#	application/utils.inc.php
This commit is contained in:
jf-cbd
2024-05-17 11:16:56 +02:00
parent b9b28e31f4 020a37ead9
commit fd6796aae3
4 changed files with 56 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.make/build/commands/setupCssCompiler.php
View File

@@ -27,7 +27,7 @@ $iTopFolder = __DIR__."/../../../";
require_once("$iTopFolder/approot.inc.php");
require_once(APPROOT."/application/utils.inc.php");
if (php_sapi_name() !== 'cli')
if (PHP_SAPI !== 'cli')
{
throw new \Exception('This script can only run from CLI');
}
@@ -48,4 +48,4 @@ if (!file_exists($sCssFile))
{
fwrite(STDERR, "Failed to compile $sCssFile, exiting.");
exit(1);
}
}