[geeklog-cvs] geeklog-1.3/system lib-plugins.php,1.47,1.48

[dhaun at iowaoutdoors.org]

Update of /var/cvs/geeklog-1.3/system
In directory www:/tmp/cvs-serv10479

Modified Files:
	lib-plugins.php 
Log Message:
In PLG_getMenuItems, check if the plugin actually returned an array before attempting an array_merge.


Index: lib-plugins.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/system/lib-plugins.php,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** lib-plugins.php	2 Oct 2004 03:32:53 -0000	1.47
--- lib-plugins.php	7 Oct 2004 08:24:57 -0000	1.48
***************
*** 210,214 ****
          if (function_exists($function)) {
              $menuitems = $function();
!             $menu = array_merge($menu,$menuitems);
          }
      }
--- 210,216 ----
          if (function_exists($function)) {
              $menuitems = $function();
!             if (is_array ($menuitems)) {
!                 $menu = array_merge ($menu, $menuitems);
!             }
          }
      }
***************
*** 1225,1227 ****
  }
  
! ?>
\ No newline at end of file
--- 1227,1229 ----
  }
  
! ?>