[geeklog-cvs] geeklog-1.3/public_html lib-common.php,1.341,1.342
vinny at iowaoutdoors.org
vinny at iowaoutdoors.org
Sun Jul 18 21:30:08 EDT 2004
Update of /var/cvs/geeklog-1.3/public_html
In directory www:/tmp/cvs-serv7689/d
Modified Files:
lib-common.php
Log Message:
Replaced array_merge with array_merge_recursive when merging admin_html and
user_html allowable html.
Index: lib-common.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/lib-common.php,v
retrieving revision 1.341
retrieving revision 1.342
diff -C2 -d -r1.341 -r1.342
*** lib-common.php 18 Jul 2004 12:02:31 -0000 1.341
--- lib-common.php 19 Jul 2004 01:30:04 -0000 1.342
***************
*** 3322,3326 ****
else
{
! $html = array_merge( $_CONF['user_html'], $_CONF['admin_html'] );
}
--- 3322,3326 ----
else
{
! $html = array_merge_recursive( $_CONF['user_html'], $_CONF['admin_html'] );
}
***************
*** 3997,4001 ****
else
{
! $html = array_merge( $_CONF['user_html'], $_CONF['admin_html'] );
}
--- 3997,4001 ----
else
{
! $html = array_merge_recursive( $_CONF['user_html'], $_CONF['admin_html'] );
}
More information about the geeklog-cvs
mailing list