Menu
▾
▴
[Tikiwiki-cvs] tiki/lib/search searchlib.php,1.19.2.16,1.19.2.17
|
From: <to...@us...> - 2005-09-30 14:36:37
|
Update of /cvsroot/tikiwiki/tiki/lib/search In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31178/tikiwiki/lib/search Modified Files: Tag: BRANCH-1-9 searchlib.php Log Message: array_merge() arguments are only arrays so use empty array() instead of NULL Index: searchlib.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/lib/search/searchlib.php,v retrieving revision 1.19.2.16 retrieving revision 1.19.2.17 diff -u -d -r1.19.2.16 -r1.19.2.17 --- searchlib.php 30 Sep 2005 00:10:50 -0000 1.19.2.16 +++ searchlib.php 30 Sep 2005 14:36:26 -0000 1.19.2.17 @@ -251,67 +251,67 @@ if ($feature_wiki == 'y' && $tiki_p_view == 'y') { $wikiresults=$this->find_part_wiki($words,$offset, $maxRecords); } else { - $wikiresults['data'] = NULL; + $wikiresults['data'] = array(); $wikiresults['cant'] = 0; } if ($feature_articles == 'y' && $tiki_p_read_article == 'y') { $artresults=$this->find_part_articles($words,$offset, $maxRecords); } else { - $artresults['data'] = NULL; + $artresults['data'] = array(); $artresults['cant'] = 0; } if ($feature_forums == 'y' && $tiki_p_forum_read == 'y') { $forumresults=$this->find_part_forums($words,$offset, $maxRecords); } else { - $forumresults['data'] = NULL; + $forumresults['data'] = array(); $forumresults['cant'] = 0; } if ($feature_blogs == 'y' && $tiki_p_read_blog == 'y') { $blogresults=$this->find_part_blogs($words,$offset, $maxRecords); } else { - $blogresults['data'] = NULL; + $blogresults['data'] = array(); $blogresults['cant'] = 0; } if ($feature_blogs == 'y' && $tiki_p_read_blog == 'y') { $blogpostsresults=$this->find_part_blog_posts($words,$offset, $maxRecords); } else { - $blogpostsresults['data'] = NULL; + $blogpostsresults['data'] = array(); $blogpostsresults['cant'] = 0; } if ($feature_faqs == 'y' && $tiki_p_view_faqs == 'y') { $faqresults=$this->find_part_faqs($words,$offset, $maxRecords); } else { - $faqresults['data'] = NULL; + $faqresults['data'] = array(); $faqresults['cant'] = 0; } if ($feature_directory == 'y' && $tiki_p_view_directory == 'y') { $dirresults=$this->find_part_directory($words,$offset, $maxRecords); } else { - $dirresults['data'] = NULL; + $dirresults['data'] = array(); $dirresults['cant'] = 0; } if ($feature_galleries == 'y' && $tiki_p_view_image_gallery == 'y') { $imggalsresults=$this->find_part_imggals($words,$offset, $maxRecords); } else { - $imggalsresults['data'] = NULL; + $imggalsresults['data'] = array(); $imggalsresults['cant'] = 0; } if ($feature_galleries == 'y' && $tiki_p_view_image_gallery == 'y') { $imgresults=$this->find_part_img($words,$offset, $maxRecords); } else { - $imgresults['data'] = NULL; + $imgresults['data'] = array(); $imgresults['cant'] = 0; } if ($feature_trackers == 'y' && $tiki_p_view_trackers == 'y') { $trackerresults=$this->find_part_trackers($words,$offset, $maxRecords); } else { - $trackerresults['data'] = NULL; + $trackerresults['data'] = array(); $trackerresults['cant'] = 0; } if ($feature_file_galleries == 'y' && $tiki_p_download_files == 'y') { $fileresults=$this->find_part_files($words,$offset, $maxRecords); } else { - $fileresults['data'] = NULL; + $fileresults['data'] = array(); $fileresults['cant'] = 0; } @@ -399,67 +399,67 @@ if ($feature_wiki == 'y' && $tiki_p_view == 'y') { $wikiresults=$this->find_exact_wiki($words,$offset, $maxRecords); } else { - $wikiresults['data'] = NULL; + $wikiresults['data'] = array(); $wikiresults['cant'] = 0; } if ($feature_articles == 'y' && $tiki_p_read_article == 'y') { $artresults=$this->find_exact_articles($words,$offset, $maxRecords); } else { - $artresults['data'] = NULL; + $artresults['data'] = array(); $artresults['cant'] = 0; } if ($feature_forums == 'y' && $tiki_p_forum_read == 'y') { $forumresults=$this->find_exact_forums($words,$offset, $maxRecords); } else { - $forumresults['data'] = NULL; + $forumresults['data'] = array(); $forumresults['cant'] = 0; } if ($feature_blogs == 'y' && $tiki_p_read_blog == 'y') { $blogresults=$this->find_exact_blogs($words,$offset, $maxRecords); } else { - $blogresults['data'] = NULL; + $blogresults['data'] = array(); $blogresults['cant'] = 0; } if ($feature_blogs == 'y' && $tiki_p_read_blog == 'y') { $blogpostsresults=$this->find_exact_blog_posts($words,$offset, $maxRecords); } else { - $blogpostsresults['data'] = NULL; + $blogpostsresults['data'] = array(); $blogpostsresults['cant'] = 0; } if ($feature_faqs == 'y' && $tiki_p_view_faqs == 'y') { $faqresults=$this->find_exact_faqs($words,$offset, $maxRecords); } else { - $faqresults['data'] = NULL; + $faqresults['data'] = array(); $faqresults['cant'] = 0; } if ($feature_directory == 'y' && $tiki_p_view_directory == 'y') { $dirresults=$this->find_exact_directory($words,$offset, $maxRecords); } else { - $dirresults['data'] = NULL; + $dirresults['data'] = array(); $dirresults['cant'] = 0; } if ($feature_galleries == 'y' && $tiki_p_view_image_gallery == 'y') { $imggalsresults=$this->find_exact_imggals($words,$offset, $maxRecords); } else { - $imggalsresults['data'] = NULL; + $imggalsresults['data'] = array(); $imggalsresults['cant'] = 0; } if ($feature_galleries == 'y' && $tiki_p_view_image_gallery == 'y') { $imgresults=$this->find_exact_img($words,$offset, $maxRecords); } else { - $imgresults['data'] = NULL; + $imgresults['data'] = array(); $imgresults['cant'] = 0; } if ($feature_trackers == 'y' && $tiki_p_view_trackers == 'y') { $trackerresults=$this->find_exact_trackers($words,$offset, $maxRecords); } else { - $trackerresults['data'] = NULL; + $trackerresults['data'] = array(); $trackerresults['cant'] = 0; } if ($feature_file_galleries == 'y' && $tiki_p_download_files == 'y') { $fileresults=$this->find_exact_files($words,$offset, $maxRecords); } else { - $fileresults['data'] = NULL; + $fileresults['data'] = array(); $fileresults['cant'] = 0; } |