[Gemstracker-svn] SF.net SVN: gemstracker:[402] trunk/library/classes/Gems

[<gem...@li...>]

Revision: 402
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=402&view=rev
Author:   mennodekker
Date:     2012-01-06 14:02:50 +0000 (Fri, 06 Jan 2012)
Log Message:
-----------
Fixed parameterCollector to not return empty values and updated doc/debug

Modified Paths:
--------------
    trunk/library/classes/Gems/Menu/ParameterCollector.php
    trunk/library/classes/Gems/Menu/SubMenuItem.php
    trunk/library/classes/Gems/Menu.php

Modified: trunk/library/classes/Gems/Menu/ParameterCollector.php
===================================================================
--- trunk/library/classes/Gems/Menu/ParameterCollector.php	2012-01-06 14:01:17 UTC (rev 401)
+++ trunk/library/classes/Gems/Menu/ParameterCollector.php	2012-01-06 14:02:50 UTC (rev 402)
@@ -81,7 +81,7 @@
      */
     public function getMenuParameter($name, $altname = null)
     {
-        if (array_key_exists($name, $this->values)) {
+        if (array_key_exists($name, $this->values) && ! empty($this->values[$name])) {
             return $this->values[$name];
         }
 
@@ -89,7 +89,7 @@
         foreach ($this->sources as $source) {
             if ($source instanceof Zend_Controller_Request_Abstract) {
                 $value = $source->getParam($name, null);
-                if (null === $value) {
+                if (null === $value || empty($value)) {
                     $value = $source->getParam($altname, $this->values[$name]);
                 }
                 $this->values[$name] = $value;
@@ -106,7 +106,7 @@
                     $this->values[$name] = $source[$name];
                 }
             }
-            if (null !== $this->values[$name]) {
+            if (null !== $this->values[$name] && ! empty($this->values[$name])) {
                 break;
             }
         }

Modified: trunk/library/classes/Gems/Menu/SubMenuItem.php
===================================================================
--- trunk/library/classes/Gems/Menu/SubMenuItem.php	2012-01-06 14:01:17 UTC (rev 401)
+++ trunk/library/classes/Gems/Menu/SubMenuItem.php	2012-01-06 14:02:50 UTC (rev 402)
@@ -153,7 +153,9 @@
         if ($this->_parameters && is_array($this->_parameters)) {
             foreach ($this->_parameters as $param => $name) {
                 $parameters[$param] = $source->getMenuParameter($name, $param);
-                // MUtil_Echo::r($param . '/' . $name . ' => ' . $value, $this->get('label'));
+                if (Gems_Menu::$verbose) {
+                        MUtil_Echo::r($param . '/' . $name . ' => ' . $parameters[$param], $this->get('label'));
+                }
             }
         }
 

Modified: trunk/library/classes/Gems/Menu.php
===================================================================
--- trunk/library/classes/Gems/Menu.php	2012-01-06 14:01:17 UTC (rev 401)
+++ trunk/library/classes/Gems/Menu.php	2012-01-06 14:02:50 UTC (rev 402)
@@ -451,7 +451,7 @@
 
     /**
      *
-     * @return Gems_Menu_MenuAbstract
+     * @return Gems_Menu_SubMenuItem
      */
     public function getCurrentParent()
     {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.