[geeklog-cvs] geeklog-1.3/system lib-plugins.php,1.27.2.1,1.27.2.2

[dhaun at iowaoutdoors.org]

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

Modified Files:
      Tag: geeklog_1_3_9_1
	lib-plugins.php 
Log Message:
Copied over 2 fixes from HEAD: Removed unused $i; check if plugin actually returned an array


Index: lib-plugins.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/system/lib-plugins.php,v
retrieving revision 1.27.2.1
retrieving revision 1.27.2.2
diff -C2 -d -r1.27.2.1 -r1.27.2.2
*** lib-plugins.php	17 Jul 2004 12:19:55 -0000	1.27.2.1
--- lib-plugins.php	7 Oct 2004 18:57:42 -0000	1.27.2.2
***************
*** 197,201 ****
          if (function_exists($function)) {
              $menuitems = $function();
!             $menu = array_merge($menu,$menuitems);
          }
      }
--- 197,203 ----
          if (function_exists($function)) {
              $menuitems = $function();
!             if (is_array ($menuitems)) {
!                 $menu = array_merge ($menu, $menuitems);
!             }
          }
      }
***************
*** 539,543 ****
                      !empty ($cur_plugin->adminurl) &&
                      !empty ($cur_plugin->plugin_image)) {
! 	            $plugins[$i] = $cur_plugin; 
                  }
              }
--- 541,545 ----
                      !empty ($cur_plugin->adminurl) &&
                      !empty ($cur_plugin->plugin_image)) {
! 	            $plugins[] = $cur_plugin; 
                  }
              }