CDPP / AMDA_Integration

Commit b600ef36562e794d9047027eef4aa3ea743ce8aa

Authored by Benjamin Renard
1 parent 1e81724e
Exists in master and in 52 other branches 10098, 5390, 6728, 7616, 8528, 8928, 9016Bis, 9049, 9084, 9259, 9326, FER_10400, FER_10663, FER_11100, FER_11242, FER_11500, FER_11586, FER_11588, FER_6265, FER_6860, FER_6951, FER_7618, FER_8455, FER_9629, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, amdadev, anr_tempete, cu2022, density_maps, develop, frames-transformation, master_vge, mlplasmas, multiplot, rm_6912, rm_7926, rm_8932, save-other-requests, test-merge, ws_get_catalog

Fix incompatibility wiyh PHP 5.4

Showing 1 changed file with 2 additions and 2 deletions   Show diff stats
Inline Side-by-side
src/InputOutput/IHMImpl/Params/IHMInputOutputParamsAbstractClass.php
  Diff comments   View file @b600ef3
... ... @@ -267,14 +267,14 @@ abstract class IHMInputOutputParamsAbstractClass implements InputOutputInterface
267 267 if (isset($datasetNode)) {
268 268 $crtNode = $datasetNode;
269 269 do {
270   - if ($crtNode->hasAttribute("group") && !empty($crtNode->getAttribute("group"))) {
  270 + if ($crtNode->hasAttribute("group") && ($crtNode->getAttribute("group") != "")) {
271 271 $inGroup = TRUE;
272 272 }
273 273 $crtNode = $crtNode->parentNode;
274 274 } while(isset($crtNode) && ($crtNode != $xml->documentElement) && !$inGroup);
275 275 }
276 276 if ($inGroup) {
277   - if ($datasetNode->hasAttribute("timeRestriction") && !empty($datasetNode->getAttribute("timeRestriction"))) {
  277 + if ($datasetNode->hasAttribute("timeRestriction") && ($datasetNode->getAttribute("timeRestriction") != "")) {
278 278 $timeRestriction = $datasetNode->getAttribute("timeRestriction");
279 279 $this->paramsData->addParamTimeRestriction($key, $timeRestriction);
280 280 }
... ...