From 21e43bddac33e2325f292ed007189b378ae6e9f5 Mon Sep 17 00:00:00 2001
From: Conrad Vermeulen <conrad@knowledgetree.com>
Date: Mon, 5 Mar 2007 10:41:33 +0000
Subject: [PATCH] KTS-1776 "RSS - php5 highlights error with array_merge on RSS Dashlet" Fixed.

---
 plugins/rssplugin/KTrss.inc.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/rssplugin/KTrss.inc.php b/plugins/rssplugin/KTrss.inc.php
index 112785c..3bf929e 100644
--- a/plugins/rssplugin/KTrss.inc.php
+++ b/plugins/rssplugin/KTrss.inc.php
@@ -61,7 +61,11 @@ class KTrss{
     
     // Gets full listing of data of documents and folders subscribed to
     function getInternalFeed($iUserId){
-    	$aFullList = array_merge(KTrss::getDocuments($iUserId), KTrss::getFolders($iUserId));
+    	$documents=KTrss::getDocuments($iUserId);
+    	$folders=KTrss::getFolders($iUserId);
+    	if (is_null($documents)) $documents=array();
+    	if (is_null($folders)) $folders=array();
+    	$aFullList = array_merge($documents,$folders );
     	if($aFullList){
     		$internalFeed = KTrss::arrayToXML($aFullList);
     		$response = rss2arrayBlock($internalFeed);
--
libgit2 0.21.4