diff --git a/htdocs/admin/external_rss.php b/htdocs/admin/external_rss.php
index 7f81a5d0fef..30646b749fa 100644
--- a/htdocs/admin/external_rss.php
+++ b/htdocs/admin/external_rss.php
@@ -206,13 +206,13 @@ print '
'.$langs->trans("Example").' | ';
print '';
print '';
print '| '.$langs->trans("Title").' | ';
-print ' | ';
+print ' | ';
print ''.$langs->trans('RSSUrlExample').' | ';
print '
';
print '';
print '| '.$langs->trans('RSSUrl').' | ';
-print ' | ';
+print ' | ';
print 'http://news.google.com/news?ned=us&topic=h&output=rss http://www.dolibarr.org/rss | ';
print '
';
print '';
@@ -243,10 +243,12 @@ if ($resql)
preg_match('/^([0-9]+)/i',$obj->note,$reg);
$idrss = $reg[1];
- //print "x".$idrss;
+ $keyrssurl="EXTERNAL_RSS_URLRSS_".$idrss;
+ $keyrsstitle="EXTERNAL_RSS_URLRSS_".$idrss;
+ //print "x".$idrss;
$rssparser=new RssParser($db);
- $result = $rssparser->parser(@constant("EXTERNAL_RSS_URLRSS_".$idrss), 5, 300, $conf->externalrss->dir_temp);
+ $result = $rssparser->parser($conf->global->$keyrssurl, 5, 300, $conf->externalrss->dir_temp);
$var=true;
@@ -269,13 +271,13 @@ if ($resql)
print '';
print "| ".$langs->trans("Title")." | ";
- print " | ";
+ print "global->$keyrsstitle . "\"> | ";
print "
";
print '';
print "| ".$langs->trans("URL")." | ";
- print " | ";
+ print "global->$keyrssurl . "\"> | ";
print "
";
@@ -304,6 +306,8 @@ if ($resql)
print "".$langs->trans("Logo")." | ";
print '';
$imageurl=$rssparser->getImageUrl();
+ $linkrss=$rssparser->getLink();
+ if (! preg_match('/^http/', $imageurl)) $imageurl=$linkrss.$imageurl;
if ($imageurl) print ' ';
else print $langs->trans("None");
print ' | ';