svn commit: r653757 - in /incubator/shindig/trunk/php/src/gadgets: Gadget.php http/HttpUtil.php

[chabotc]

Author: chabotc
Date: Tue May  6 05:13:22 2008
New Revision: 653757

URL: http://svn.apache.org/viewvc?rev=653757&view=rev
Log:
Propper default view parsing

Modified:
    incubator/shindig/trunk/php/src/gadgets/Gadget.php
    incubator/shindig/trunk/php/src/gadgets/http/HttpUtil.php

Modified: incubator/shindig/trunk/php/src/gadgets/Gadget.php
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/php/src/gadgets/Gadget.php?rev=653757&r1=653756&r2=653757&view=diff
==============================================================================
--- incubator/shindig/trunk/php/src/gadgets/Gadget.php (original)
+++ incubator/shindig/trunk/php/src/gadgets/Gadget.php Tue May  6 05:13:22 2008
@@ -293,7 +293,7 @@
        
        public function getView($viewName)
        {
-               return $this->views[$viewName];
+               return isset($this->views[$viewName]) ? $this->views[$viewName] 
: false;
        }
 }
 

Modified: incubator/shindig/trunk/php/src/gadgets/http/HttpUtil.php
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/php/src/gadgets/http/HttpUtil.php?rev=653757&r1=653756&r2=653757&view=diff
==============================================================================
--- incubator/shindig/trunk/php/src/gadgets/http/HttpUtil.php (original)
+++ incubator/shindig/trunk/php/src/gadgets/http/HttpUtil.php Tue May  6 
05:13:22 2008
@@ -29,18 +29,19 @@
                if (empty($view)) {
                        $containerConfig = $context->getContainerConfig();
                        $config = $containerConfig->getConfig('default', 
'gadgets.features');
-                       $configViews = $config['views'];
-                       $views = $configViews[$context->getView()];
-                       if (!empty($views)) {
-                               $aliasesViews = $views['aliases'];
-                               for ($i = 0; $i < count($aliasesViews); $i++) {
-                                       $view = 
$gadget->getView($aliasesViews[$i]);
-                                       if (!empty($view)) {
-                                               break;
+                       $configViews = $config['views'];
+                       if (isset($configViews[$context->getView()])) {
+                               $views = $configViews[$context->getView()];
+                               if (!empty($views)) {
+                                       $aliasesViews = $views['aliases'];
+                                       for ($i = 0; $i < count($aliasesViews); 
$i++) {
+                                               $view = 
$gadget->getView($aliasesViews[$i]);
+                                               if (!empty($view)) {
+                                                       break;
+                                               }
                                        }
-                               }
-                       }
-                       if (empty($view)) {
+                               }
+                       } else {
                                $view = $gadget->getView(DEFAULT_VIEW);
                        }
                }