CDPP / AMDA_IHM

Commit a8ed4da2a7c9a209f05c2e330b6d24307f135bad

Authored by Elena.Budnik
1 parent 82c83a30
Exists in master and in 98 other branches 10098, 10178, 5390, 6629, 6728, 6920, 7494, 7497, 7616, 8459, 8528, 8928, 9014, 9016Bis, 9017, 9049, 9084, 9259, 9326, 9345, 9505, 9660, 9750, 9750.bck, 9800, 9980, FER_10285, FER_10400, FER_10435, FER_10557, FER_10663, FER_10765, FER_10828, FER_10828_2, FER_10829, FER_10836, FER_10852, FER_10934, FER_11100, FER_11242, FER_11478, FER_11500, FER_11537, FER_11586, FER_11588, FER_5119, FER_5165, FER_6265, FER_6860, FER_6899, FER_6951, FER_7618, FER_7862, FER_8455, FER_9629, FER_9660, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_11427, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, amdadev, amdadev_test, anr_tempete, catalog-histo, create-user, cu2022, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, homePage, master_vge, mlplasmas, multiplot, new-save-plot-request, openam, plot-request, remoteData, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, special-params, test-merge, ws_get_catalog

corr for php 5.4

Showing 1 changed file with 9 additions and 4 deletions   Show diff stats
Inline Side-by-side
php/RemoteDataCenter/ImpexParamManager.php
  Diff comments   View file @a8ed4da
... ... @@ -342,8 +342,8 @@ class ImpexParamManager
342 342  
343 343 $res["param"]["info"]["realVar"] = $this->parameterKey;
344 344 $res["param"]["info"]["type"] = $varInfo['type'];
345   - $res["param"]["info"]["minSampling"] = $varSampling[4];
346   - $res["param"]["info"]["maxSampling"] = $varSampling[4];
  345 + $res["param"]["info"]["minSampling"] = $varSampling[2];
  346 + $res["param"]["info"]["maxSampling"] = $varSampling[2];
347 347 $res["param"]["info"]["plotType"] = "Spectro";
348 348 $res["param"]["info"]["size"] = $varInfo['size'];
349 349 }
... ... @@ -427,7 +427,12 @@ class ImpexParamManager
427 427 {
428 428 $params = array();
429 429  
430   - if ($templateArgs)
  430 + if ($templateArgs) {
  431 + $templateArr = (array)$templateArgs;
  432 + $notEmptyTemplateArgs = !empty($templateArr);
  433 + }
  434 +
  435 + if ($templateArgs && $notEmptyTemplateArgs)
431 436 {
432 437 $extraParams = array();
433 438  
... ... @@ -595,4 +600,4 @@ class ImpexParamManager
595 600 $this->baseManager->deleteViTotal($vi);
596 601 }
597 602 }
598   -}
599 603 \ No newline at end of file
  604 +}
... ...