CDPP / AMDA_IHM

Commit 91dee2fde62efdd42286d3e74ec0d181d9a3fbb2

Authored by Benjamin Renard
1 parent 41a65bfc
Exists in master and in 111 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, alias, amdadev, amdadev_test, anr_tempete, catalog-histo, create-user, cu2022, data-activities, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, homePage, install-rework, livraison-akka, master_vge, minimize, mlplasmas, multiplot, new-save-plot-request, openam, plot-request, plot-request-update, plot-tt-catalog, remoteData, rm_5118, rm_5776, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, save-plot, save-plot-request, shared-objects-updater, special-params, sum-components-indexes, test-merge, ws_get_catalog

Fix bug with the call of empty function

Showing 1 changed file with 14 additions and 8 deletions   Show diff stats
Inline Side-by-side
php/classes/SharedObjectTreeFile.php
  Diff comments   View file @91dee2f
@@ -91,9 +91,11 @@ class SharedObjectTreeFile { @@ -91,9 +91,11 @@ class SharedObjectTreeFile {
91 91
92 $folders = array(); 92 $folders = array();
93 foreach ($folderNodes as $folderNode) { 93 foreach ($folderNodes as $folderNode) {
94 - if (empty($folderNode->getAttribute('name')) || empty($folderNode->getAttribute('xml:id'))) 94 + $nameAtt = $folderNode->getAttribute('name');
  95 + $idAtt = $folderNode->getAttribute('xml:id');
  96 + if (empty($nameAtt) || empty($idAtt))
95 continue; 97 continue;
96 - $folders[] = array('id' => $folderNode->getAttribute('xml:id'), 'name' => $folderNode->getAttribute('name')); 98 + $folders[] = array('id' => $idAtt, 'name' => $nameAtt);
97 } 99 }
98 100
99 return $folders; 101 return $folders;
@@ -127,11 +129,13 @@ class SharedObjectTreeFile { @@ -127,11 +129,13 @@ class SharedObjectTreeFile {
127 $folderNodes = $listNode->getElementsByTagName("folder"); 129 $folderNodes = $listNode->getElementsByTagName("folder");
128 130
129 foreach ($folderNodes as $folderNode) { 131 foreach ($folderNodes as $folderNode) {
130 - if (empty($folderNode->getAttribute('name')) || empty($folderNode->getAttribute('xml:id'))) 132 + $nameAtt = $folderNode->getAttribute('name');
  133 + $idAtt = $folderNode->getAttribute('xml:id');
  134 + if (empty($nameAtt) || empty($idAtt))
131 continue; 135 continue;
132 - if ($folder_id != $folderNode->getAttribute('xml:id')) 136 + if ($folder_id != $idAtt)
133 continue; 137 continue;
134 - return $folderNode->getAttribute('name'); 138 + return $nameAtt;
135 } 139 }
136 140
137 return FALSE; 141 return FALSE;
@@ -146,14 +150,16 @@ class SharedObjectTreeFile { @@ -146,14 +150,16 @@ class SharedObjectTreeFile {
146 $folderNodes = $listNode->getElementsByTagName("folder"); 150 $folderNodes = $listNode->getElementsByTagName("folder");
147 151
148 foreach ($folderNodes as $folderNode) { 152 foreach ($folderNodes as $folderNode) {
149 - if (empty($folderNode->getAttribute('name')) || empty($folderNode->getAttribute('xml:id'))) 153 + $nameAtt = $folderNode->getAttribute('name');
  154 + $idAtt = $folderNode->getAttribute('xml:id');
  155 + if (empty($nameAtt) || empty($idAtt))
150 continue; 156 continue;
151 157
152 $objectNodes = $folderNode->getElementsByTagName($object_type); 158 $objectNodes = $folderNode->getElementsByTagName($object_type);
153 159
154 foreach ($objectNodes as $objectNode) { 160 foreach ($objectNodes as $objectNode) {
155 - if ($objectNode->getAttribute('xml:id') == $object_id)  
156 - return $folderNode->getAttribute('xml:id'); 161 + if ($idAtt == $object_id)
  162 + return $idAtt;
157 } 163 }
158 } 164 }
159 165