You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@shindig.apache.org by ch...@apache.org on 2008/05/15 23:51:51 UTC
svn commit: r656862 -
/incubator/shindig/trunk/php/src/gadgets/ContainerConfig.php
Author: chabotc
Date: Thu May 15 14:51:51 2008
New Revision: 656862
URL: http://svn.apache.org/viewvc?rev=656862&view=rev
Log:
fixed typo in container config merge function
Modified:
incubator/shindig/trunk/php/src/gadgets/ContainerConfig.php
Modified: incubator/shindig/trunk/php/src/gadgets/ContainerConfig.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/src/gadgets/ContainerConfig.php?rev=656862&r1=656861&r2=656862&view=diff
==============================================================================
--- incubator/shindig/trunk/php/src/gadgets/ContainerConfig.php (original)
+++ incubator/shindig/trunk/php/src/gadgets/ContainerConfig.php Thu May 15 14:51:51 2008
@@ -98,7 +98,7 @@
$ret[] = $value;
} else {
if (is_array($value) && isset($ret[$key])) {
- $ret[$key] = array_merge_recursive2($ret[$key], $value);
+ $ret[$key] = $this->mergeConfig($ret[$key], $value);
} else {
$ret[$key] = $value;
}