From febc6b2f72abaeb5571c195bab941272b2f0288e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 11 Sep 2005 16:23:30 +0000
Subject: [PATCH] Fix: Corrige bugs gestion erreur de magpierss

---
 htdocs/includes/magpierss/rss_fetch.inc | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/htdocs/includes/magpierss/rss_fetch.inc b/htdocs/includes/magpierss/rss_fetch.inc
index 8a919811e65..17517497ff4 100644
--- a/htdocs/includes/magpierss/rss_fetch.inc
+++ b/htdocs/includes/magpierss/rss_fetch.inc
@@ -202,11 +202,17 @@ function fetch_rss ($url) {
 					$errormsg .=  "(HTTP Response: " . $resp->response_code .')';
 				}
 				
-				// LDR FIX BUG Si echec recup http mais cache bien lu, on stock erreur dans object rss
-				if ($rss) {
-				    $rss->ERROR=$errormsg;
-				    if ($cache && $cache_key) $rss->date=filemtime($cache->file_name($url));
+				// LDR FIX BUG Si echec recup http mais cache bien lu,
+				// on stock erreur dans object rss
+				if ($rss)
+				{
+				    if ($cache && $cache_key) $rss->date=filemtime($cache->file_name($cache_key));
 				}
+                else
+                {
+                    $rss=$cache;
+                }
+                $rss->ERROR=$errormsg;
 			}
 		}
 		else {
@@ -246,12 +252,18 @@ function error ($errormsg, $lvl=E_USER_WARNING) {
 		if ( $errormsg ) {
 			$errormsg = "MagpieRSS: $errormsg";
 			$MAGPIE_ERROR = $errormsg;
-			trigger_error( $errormsg, $lvl);				
+            // LDR BUG FIX On affiche erreur que si en mode debug
+            if ( MAGPIE_DEBUG ) {
+    			trigger_error( $errormsg, $lvl);
+    	    }
 		}
 }
 
 function debug ($debugmsg, $lvl=E_USER_NOTICE) {
-	trigger_error("MagpieRSS [debug] $debugmsg", $lvl);
+    // LDR BUG FIX On affiche erreur que si en mode debug
+    if ( MAGPIE_DEBUG ) {
+	    trigger_error("MagpieRSS [debug] $debugmsg", $lvl);
+	}
 }
 			
 /*=======================================================================*\