[geeklog-cvs] Geeklog-1.x/plugins/polls install_defaults.php, 1.2, 1.3

[Dirk Haun]

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

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/polls/install_defaults.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** install_defaults.php	21 Mar 2008 17:09:26 -0000	1.2
--- install_defaults.php	4 May 2008 09:16:33 -0000	1.3
***************
*** 105,109 ****
  
      if (is_array($_PO_CONF) && (count($_PO_CONF) > 1)) {
!         $_PO_DEFAULT = $_PO_CONF;
      }
  
--- 105,109 ----
  
      if (is_array($_PO_CONF) && (count($_PO_CONF) > 1)) {
!         $_PO_DEFAULT = array_merge($_PO_DEFAULT, $_PO_CONF);
      }