EP/website-typo3
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Björn Fromme
2019-07-28 13:18:40 +02:00
parent f254fee4ab 7768624a6e
commit 373baa642b
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/typo3conf/ext/ep_products/Classes/Service/ContingentImportService.php
+1 -1
View File
@@ -121,7 +121,7 @@ class ContingentImportService implements SingletonInterface
{ {
libxml_use_internal_errors (true); libxml_use_internal_errors (true);
/** @var \SimpleXMLElement $xmlData */ /** @var \SimpleXMLElement $xmlData */
if (!$xmlData = simplexml_load_file($file)) { if (!$xmlData = simplexml_load_string(file_get_contents($file))) {
libxml_clear_errors(); libxml_clear_errors();
return 0; return 0;
} }
public/typo3conf/ext/ep_products/Classes/Service/DateImportService.php
+11 -3
View File
@@ -171,8 +171,12 @@ class DateImportService implements SingletonInterface
*/ */
public function parseProductXmlFile($file) public function parseProductXmlFile($file)
{ {
libxml_use_internal_errors (true);
/** @var \SimpleXMLElement $xmlData */ /** @var \SimpleXMLElement $xmlData */
$xmlData = simplexml_load_file($file); if (!$xmlData = simplexml_load_string(file_get_contents($file))) {
libxml_clear_errors();
return 0;
}
if ($xmlData->reise[0] === null) { if ($xmlData->reise[0] === null) {
return 0; return 0;
@@ -798,14 +802,18 @@ class DateImportService implements SingletonInterface
if (!array_key_exists($key, $list)) { if (!array_key_exists($key, $list)) {
$list[$key] = []; $list[$key] = [];
} }
$list[$key] = array_merge($list[$key], $section); $list[$key] += $section;
} }
} }
protected function importPickups() protected function importPickups()
{ {
libxml_use_internal_errors (true);
$path = GeneralUtility::getFileAbsFileName('fileadmin/xmlexport/zustiege.xml'); $path = GeneralUtility::getFileAbsFileName('fileadmin/xmlexport/zustiege.xml');
$xmlData = simplexml_load_file($path); if (!$xmlData = simplexml_load_string(file_get_contents($path))) {
libxml_clear_errors();
return;
}
foreach ($xmlData->zustieg as $entry) foreach ($xmlData->zustieg as $entry)
{ {