Author: weaverryan
Date: 2010-02-06 21:35:48 +0100 (Sat, 06 Feb 2010)
New Revision: 27620
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/lib/menu/sfSympalMenuSiteManager.class.php
Log:
[1.4][sfSympalPlugin][1.0] Removing the if block here that previously checked
for null. I removed the distinction between null and false, which means that we
should always call this function one way or another.
However, null was the default previously, which meant that the showChildren
method was NOT called. Since sfSympalMenu's _showChildren children property
defaults to true, the default value on these methods needs to match that so as
to not effectively change sfSympalMenu's default.
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/lib/menu/sfSympalMenuSiteManager.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/lib/menu/sfSympalMenuSiteManager.class.php
2010-02-06 20:10:48 UTC (rev 27619)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/lib/menu/sfSympalMenuSiteManager.class.php
2010-02-06 20:35:48 UTC (rev 27620)
@@ -87,7 +87,7 @@
$this->initialize();
}
- public static function getMenu($name, $showChildren = false, $class = null)
+ public static function getMenu($name, $showChildren = true, $class = null)
{
return self::getInstance()->_getMenu($name, $showChildren, $class);
}
@@ -97,7 +97,7 @@
return sfSympalConfig::get('menu_cache', 'enabled', true) ?
sfSympalConfiguration::getActive()->getCache() : false;
}
- protected function _getMenu($name, $showChildren = false, $class = null)
+ protected function _getMenu($name, $showChildren = true, $class = null)
{
if (is_scalar($name) && isset($this->_rootSlugs[$name]))
{
@@ -134,10 +134,7 @@
if ($menu)
{
- if ($showChildren)
- {
- $menu->callRecursively('showChildren', $showChildren);
- }
+ $menu->callRecursively('showChildren', $showChildren);
$menu->setCacheKey($cacheKey);
}
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/symfony-svn?hl=en.
