Peter M. Groen / knowledgetree

Commit 21e43bddac33e2325f292ed007189b378ae6e9f5

Authored by Conrad Vermeulen
1 parent 7e119ddf

KTS-1776 

"RSS - php5 highlights error with array_merge on RSS Dashlet"
Fixed.

Reviewed By: Jalaloedien Abrahams

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@6364 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 5 additions and 1 deletions
plugins/rssplugin/KTrss.inc.php
  View file @21e43bd
@@ -61,7 +61,11 @@ class KTrss{ @@ -61,7 +61,11 @@ class KTrss{
61 61
62 // Gets full listing of data of documents and folders subscribed to 62 // Gets full listing of data of documents and folders subscribed to
63 function getInternalFeed($iUserId){ 63 function getInternalFeed($iUserId){
64 - $aFullList = array_merge(KTrss::getDocuments($iUserId), KTrss::getFolders($iUserId)); 64 + $documents=KTrss::getDocuments($iUserId);
  65 + $folders=KTrss::getFolders($iUserId);
  66 + if (is_null($documents)) $documents=array();
  67 + if (is_null($folders)) $folders=array();
  68 + $aFullList = array_merge($documents,$folders );
65 if($aFullList){ 69 if($aFullList){
66 $internalFeed = KTrss::arrayToXML($aFullList); 70 $internalFeed = KTrss::arrayToXML($aFullList);
67 $response = rss2arrayBlock($internalFeed); 71 $response = rss2arrayBlock($internalFeed);