diff --git a/public_html/deployment/classes/foremanapi.class.php b/public_html/deployment/classes/foremanapi.class.php index d6d8fd0648390bdcc8980084ec7dfd01a2975a24..1e7030289d78f96d96c5ae22b67e88429420f82e 100644 --- a/public_html/deployment/classes/foremanapi.class.php +++ b/public_html/deployment/classes/foremanapi.class.php @@ -154,7 +154,7 @@ class ForemanApi { */ protected function log($sMessage, $sLevel = "info") { global $oCLog; - return $oCLog->add(basename(__FILE__) . " class " . __CLASS__ . " - " . $sMessage, $sLevel); + return $oCLog ? $oCLog->add(basename(__FILE__) . " class " . __CLASS__ . " - " . $sMessage, $sLevel) : false; } /** diff --git a/public_html/deployment/classes/project.class.php b/public_html/deployment/classes/project.class.php index 9a81726d46df6c2f70a75d36c85b10134ebcd229..3ce06797a1cd17b26e36c700fdeac603259c5eb8 100644 --- a/public_html/deployment/classes/project.class.php +++ b/public_html/deployment/classes/project.class.php @@ -914,14 +914,13 @@ class project extends base { foreach (array_keys($this->getPlaces()) as $sPlace) { if ( $sPlace!=='onhold' - && array_key_exists($sPlace, $aDataPhase) - // && array_key_exists('version', $aDataPhase[$sPlace]) + && isset($aDataPhase[$sPlace]['version']) ) { - if($bFirstVersion && isset($aDataPhase[$sPlace]['version']) && !$bHasDifferentVersions && $bFirstVersion!==$aDataPhase[$sPlace]['version']){ + if($bFirstVersion && !$bHasDifferentVersions && $bFirstVersion!==$aDataPhase[$sPlace]['version']){ $bHasDifferentVersions=true; } if (!$bFirstVersion){ - $bFirstVersion = isset($aDataPhase[$sPlace]['version']) ? $aDataPhase[$sPlace]['version'] : $bFirstVersion; + $bFirstVersion = $aDataPhase[$sPlace]['version']; } } }