On Mon, Feb 7, 2011 at 12:53, vmassol <[email protected]> wrote:

Author: vmassol Date: 2011-02-07 12:53:01 +0100 (Mon, 07 Feb 2011) New Revision: 34450

Modified:   platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/internal/macro/WikiMacroExecutionEventListener.java Log: XWIKI-5928: ID macros generated from HTML anchors are not properly closed

Should be XWIKI-5957: New permission check introduced in 2.5 forbids macros which need programming rights in subwikis

* Fixed checkstyle error

Modified: platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/internal/macro/WikiMacroExecutionEventListener.java =================================================================== --- platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/internal/macro/WikiMacroExecutionEventListener.java      2011-02-07 11:27:36 UTC (rev 34449) +++ platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/internal/macro/WikiMacroExecutionEventListener.java      2011-02-07 11:53:01 UTC (rev 34450) @@ -76,9 +76,15 @@     @Requirement     private DocumentAccessBridge documentAccessBridge;

+    /** +     * Temporarily used to resolve the user as a valid document reference. +     */     @Requirement     private DocumentReferenceResolver<String> resolver;

+    /** +     * Temporarily used to serialize a document reference pointing to a user as a String. +     */     @Requirement     private EntityReferenceSerializer<String> serializer;

_______________________________________________ notifications mailing list [email protected] http://lists.xwiki.org/mailman/listinfo/notifications

-- Thomas Mortagne