roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r353808 - /incubator/roller/trunk/src/org/roller/presentation/tags/menu/MenuItemImpl.java
Date Sun, 04 Dec 2005 03:51:34 GMT
Author: snoopdave
Date: Sat Dec  3 19:51:31 2005
New Revision: 353808

URL: http://svn.apache.org/viewcvs?rev=353808&view=rev
Log:
Fixing small bug that prevented editor menu from rendering on blog pages

Modified:
    incubator/roller/trunk/src/org/roller/presentation/tags/menu/MenuItemImpl.java

Modified: incubator/roller/trunk/src/org/roller/presentation/tags/menu/MenuItemImpl.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/tags/menu/MenuItemImpl.java?rev=353808&r1=353807&r2=353808&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/tags/menu/MenuItemImpl.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/tags/menu/MenuItemImpl.java Sat Dec
 3 19:51:31 2005
@@ -61,15 +61,15 @@
             itemKey = (String)req.getAttribute(RollerMenuModel.MENU_ITEM_KEY);
         }
         
+        ActionMapping amapping = (ActionMapping)req.getAttribute(Globals.MAPPING_KEY);
         if (itemKey != null && itemKey.equals(mName)) 
         {
             selected = true;
         }
-		else if (mForward != null) 
+		else if (mForward != null && amapping != null) 
 		{
             ServletContext ctx = RollerContext.getServletContext();     
 			ModuleConfig mConfig = RequestUtils.getModuleConfig(req, ctx);
-            ActionMapping amapping = (ActionMapping)req.getAttribute(Globals.MAPPING_KEY);
             List fconfigs = new ArrayList();
 			fconfigs.add(mConfig.findForwardConfig(mForward));
             if (mSubforwards != null) {



Mime
View raw message