Commits

Anonymous committed 6b69d6e

0.12.3: fix highlight of active navigation item when a legacy ClearSilver plugin processes the request.

Closes #7418. Thanks to Filipe Correia for testing.

Comments (0)

Files changed (2)

trac/templates/header.cs

     if:first ?>first<?cs /if ?><?cs
     if:(item.active || first) && last ?> <?cs /if ?><?cs
     if:last ?>last<?cs /if ?>"<?cs
-   /if ?>><?cs var:item ?></li><?cs
+   /if ?>><?cs var:item.label ?></li><?cs
    set:idx = idx + 1 ?><?cs
   /each ?></ul><?cs
  /if ?><?cs

trac/web/chrome.py

         req.hdf['chrome.logo'] = req.chrome['logo']
 
         for category, items in req.chrome['nav'].items():
-            for item in items:
-                prefix = 'chrome.nav.%s.%s' % (category, item['name'])
-                req.hdf[prefix] = item['label']
+            req.hdf['chrome.nav.%s' % category] = items
 
     def populate_data(self, req, data):
         d = self._default_context_data.copy()