[geeklog-cvs] Geeklog-1.x/plugins/staticpages install_defaults.php, 1.5, 1.6

[Dirk Haun]

Update of /cvsroot/geeklog/Geeklog-1.x/plugins/staticpages
In directory qs1489.pair.com:/tmp/cvs-serv50887/staticpages

Modified Files:
	install_defaults.php 
Log Message:
Fixed plugin updates: Need to merge the DEFAULT config with the old CONF so that we pick up new entries


Index: install_defaults.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/staticpages/install_defaults.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** install_defaults.php	21 Mar 2008 17:09:26 -0000	1.5
--- install_defaults.php	4 May 2008 09:16:33 -0000	1.6
***************
*** 122,126 ****
  
      if (is_array($_SP_CONF) && (count($_SP_CONF) > 1)) {
!         $_SP_DEFAULT = $_SP_CONF;
      }
  
--- 122,126 ----
  
      if (is_array($_SP_CONF) && (count($_SP_CONF) > 1)) {
!         $_SP_DEFAULT = array_merge($_SP_DEFAULT, $_SP_CONF);
      }