lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix error message not reported

Browse Source
This commit is contained in:
Laurent Destailleur 2020-06-22 01:02:17 +02:00
parent 119bf45177
commit 1ce5b78a6b
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/boxes/box_external_rss.php
View File

@ -101,7 +101,9 @@ class box_external_rss extends ModeleBoxes
if ($result < 0 || !empty($rssparser->error)) if ($result < 0 || !empty($rssparser->error))
{ {
// Show warning // Show warning
$title .= " ".img_error($langs->trans("FailedToRefreshDataInfoNotUpToDate", ($rssparser->getLastFetchDate() ?dol_print_date($rssparser->getLastFetchDate(), "dayhourtext") : $langs->trans("Unknown")))); $errormessage = $langs->trans("FailedToRefreshDataInfoNotUpToDate", ($rssparser->getLastFetchDate() ? dol_print_date($rssparser->getLastFetchDate(), "dayhourtext") : $langs->trans("Unknown")));
if ($rssparser->error) $errormessage .= " - ".$rssparser->error;
$title .= " ".img_error($errormessage);
$this->info_box_head = array('text' => $title, 'limit' => 0); $this->info_box_head = array('text' => $title, 'limit' => 0);
} }
else else
@ -109,7 +111,7 @@ class box_external_rss extends ModeleBoxes
$this->info_box_head = array( $this->info_box_head = array(
'text' => $title, 'text' => $title,
'sublink' => $link, 'sublink' => $link,
'subtext'=>$langs->trans("LastRefreshDate").': '.($rssparser->getLastFetchDate() ?dol_print_date($rssparser->getLastFetchDate(), "dayhourtext") : $langs->trans("Unknown")), 'subtext'=>$langs->trans("LastRefreshDate").': '.($rssparser->getLastFetchDate() ? dol_print_date($rssparser->getLastFetchDate(), "dayhourtext") : $langs->trans("Unknown")),
'subpicto'=>'globe', 'subpicto'=>'globe',
'target'=>'_blank', 'target'=>'_blank',
); );

8
htdocs/core/class/rssparser.class.php
View File

@ -261,9 +261,15 @@ class RssParser
} }
else else
{ {
if (! function_exists('xml_parser_create')) {
$this->error = 'Function xml_parser_create are not supported by your PHP';
return -1;
}
$xmlparser = xml_parser_create(''); $xmlparser = xml_parser_create('');
if (!is_resource($xmlparser)) { if (!is_resource($xmlparser)) {
$this->error = "ErrorFailedToCreateParser"; return -1; $this->error = "ErrorFailedToCreateParser";
return -1;
} }
xml_set_object($xmlparser, $this); xml_set_object($xmlparser, $this);