Allowing one plugin to define 2 top bar menus

git-svn-id: http://dev.piwik.org/svn/trunk@5161 59fd770c-687e-43c8-a1e3-f5a4ff64c105

core/View.php

@@ -80,6 +80,7 @@ class Piwik_View implements Piwik_iView
 	{
 		try {
 			$this->currentModule = Piwik::getModule();
+			$this->currentAction = Piwik::getAction();
 			$userLogin = Piwik::getCurrentUserLogin();
 			$this->userLogin = $userLogin;
 			

plugins/CoreHome/templates/top_bar.tpl

@@ -5,7 +5,7 @@
     
         {if isset($menu._html)}
             {$menu._html}
-        {elseif $menu._url.module == $currentModule}
+        {elseif $menu._url.module == $currentModule && (empty($menu._url.action) || $menu._url.action == $currentAction)}
             <span class="topBarElem"><b>{$label|translate}</b></span> | 
         {else}
             <span class="topBarElem"><a id="topmenu-{$menu._url.module|strtolower}" href="index.php{$menu._url|@urlRewriteWithParameters}">{$label|translate}</a></span> |