COmanage Developers List

Author: marie
Date: 2013-03-04 19:20:45 -0500 (Mon, 04 Mar 2013)
New Revision: 477

Modified:
   registry/trunk/app/View/Layouts/default.ctp
Log:
co428 making sidebar more robust

Modified: registry/trunk/app/View/Layouts/default.ctp
===================================================================
--- registry/trunk/app/View/Layouts/default.ctp 2013-03-03 22:09:24 UTC (rev 
476)
+++ registry/trunk/app/View/Layouts/default.ctp 2013-03-05 00:20:45 UTC (rev 
477)
@@ -437,12 +437,15 @@
                  
                 $url = $link['url'];
 
-                $options = array_merge(array('escape' => FALSE),
-                                       (array)$link['options']
-                                      );
+                if(isset($link['options']))
+                  $options = (array)$link['options'];
+                $options['escape'] = FALSE;
 
                 // Use the built in Cakephp popup
-                $popup = $link['popup'];
+                if(isset($link['popup']))
+                  $popup = $link['popup'];
+                else
+                  $popup = null;
                 
                 print $this->Html->link(
                   $icontitle,