diff --git a/lib/Varien/Convert/Parser/Xml/Excel.php b/lib/Varien/Convert/Parser/Xml/Excel.php index 5fa94863736..764fde6305a 100644 --- a/lib/Varien/Convert/Parser/Xml/Excel.php +++ b/lib/Varien/Convert/Parser/Xml/Excel.php @@ -36,17 +36,19 @@ public function parse() $dom->loadXML($this->getData()); $worksheets = $dom->getElementsByTagName('Worksheet'); - + /** @var DOMElement $worksheet */ foreach ($worksheets as $worksheet) { $wsName = $worksheet->getAttribute('ss:Name'); $rows = $worksheet->getElementsByTagName('Row'); $firstRow = true; $fieldNames = []; $wsData = []; + /** @var DOMElement $row */ foreach ($rows as $row) { $index = 1; $cells = $row->getElementsByTagName('Cell'); $rowData = []; + /** @var DOMElement $cell */ foreach ($cells as $cell) { $value = $cell->getElementsByTagName('Data')->item(0)->nodeValue; $ind = $cell->getAttribute('ss:Index'); @@ -195,7 +197,7 @@ public function getRowXml(array $row) $xmlData = []; $xmlData[] = ''; foreach ($row as $value) { - $this->_xmlElement->row = htmlspecialchars($value); + $this->_xmlElement->row = htmlspecialchars((string) $value); $value = str_replace($xmlHeader, '', $this->_xmlElement->asXML()); $value = preg_replace($xmlRegexp, '\\1', $value); $dataType = 'String';