Update of /cvsroot/phpmp/phpMP/includes
In directory usw-pr-cvs1:/tmp/cvs-serv29497
Modified Files:
core.php
Log Message:
Decided to go with Eric's suggestion of merging two arrays together instead of a string being exploded.
Index: core.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/includes/core.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** core.php 5 Nov 2002 22:26:19 -0000 1.22
--- core.php 5 Nov 2002 22:33:40 -0000 1.23
***************
*** 28,36 ****
// Accepts: $required_files (string of needed files separated by commas).
// Returns: Boolean - true
! function init ( $required_files )
{
- $required_array = explode( '', $required_files );
-
$required_array[] = 'debug';
$required_array[] = 'constants';
--- 28,34 ----
// Accepts: $required_files (string of needed files separated by commas).
// Returns: Boolean - true
! function init ( $optional_files )
{
$required_array[] = 'debug';
$required_array[] = 'constants';
***************
*** 41,44 ****
--- 39,44 ----
$required_array[] = 'Smarty.class';
$required_array[] = 'template';
+
+ $required_array = array_merge_recursive( $required_array, $optional_files );
$i = 0;
|
