svn commit: r703090 - /incubator/shindig/trunk/php/src/gadgets/ContainerConfig.php

[chabotc]

Author: chabotc
Date: Thu Oct  9 00:30:54 2008
New Revision: 703090

URL: http://svn.apache.org/viewvc?rev=703090&view=rev
Log:
SHINDIG-450 by Erel Segal, glitch in merging defaults from container.js

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=703090&r1=703089&r2=703090&view=diff
==============================================================================
--- incubator/shindig/trunk/php/src/gadgets/ContainerConfig.php (original)
+++ incubator/shindig/trunk/php/src/gadgets/ContainerConfig.php Thu Oct  9 
00:30:54 2008
@@ -74,8 +74,8 @@
                if (isset($this->config[$container]) && 
isset($this->config[$container][$name])) {
                        $config = $this->config[$container][$name];
                }
-               if ($container != $this->default_container && 
isset($this->config[$container][$name])) {
-                       $config = 
$this->mergeConfig($this->config[$container][$name], $config);
+               if ($container != $this->default_container && 
isset($this->config[$this->default_container]) && 
isset($this->config[$this->default_container][$name])) {
+                       $config = 
$this->mergeConfig($this->config[$this->default_container][$name], $config);
                }
                return $config;
        }