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

Merge remote-tracking branch 'origin/develop' into feature/backoffice-full-moon-design

Browse Source 
# Conflicts:
#	webservices/import.php
This commit is contained in:
Pierre Goiffon
2020-09-18 10:48:34 +02:00
parent 68b8490288 5405ae1d91
commit 745e4aa424
31 changed files with 1387 additions and 1224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
webservices/cron.php
View File

@@ -340,11 +340,9 @@ function CronExec($oP, $bVerbose, $bDebug=false)
/**
* @param \WebPage $oP
*/
function CheckMaintenanceMode(Page $oP): void
{
function CheckMaintenanceMode(Page $oP) {
// Verify files instead of reloading the full config each time
if (file_exists(MAINTENANCE_MODE_FILE) || file_exists(READONLY_MODE_FILE))
{
if (file_exists(MAINTENANCE_MODE_FILE) || file_exists(READONLY_MODE_FILE)) {
$oP->p("Maintenance detected, exiting");
exit(EXIT_CODE_ERROR);
}