[Openutils-svn] SF.net SVN: openutils:[3621] trunk/openutils-mgnlmedia/src/main/java/net/ sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java

[<fg...@us...>]

Revision: 3621
          http://openutils.svn.sourceforge.net/openutils/?rev=3621&view=rev
Author:   fgiust
Date:     2011-08-21 17:01:44 +0000 (Sun, 21 Aug 2011)

Log Message:
-----------
MEDIA-251 MediaEL.node() should not require a webcontext

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java	2011-08-20 15:50:25 UTC (rev 3620)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java	2011-08-21 17:01:44 UTC (rev 3621)
@@ -154,11 +154,18 @@
 
         if (content != null && !(content instanceof NodeMapWrapper))
         {
-            Content currentpage = MgnlContext.getAggregationState().getMainContent();
+            Content currentpage = null;
+
+            if (MgnlContext.isWebContext())
+            {
+                currentpage = MgnlContext.getAggregationState().getMainContent();
+            }
+
             if (currentpage == null)
             {
                 currentpage = content;
             }
+
             content = new NodeMapWrapper(new I18nContentWrapper(content), currentpage.getHandle());
         }
 


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