Re: [xwiki-devs] [xwiki-notifications] r17629 - platform/core/branches/xwiki-core-1.8/xwiki-core/src/main/java/com/xpn/xwiki/render/filter

Author: jvelociter Date: 2009-03-14 23:32:39 +0100 (Sat, 14 Mar 2009) New Revision: 17629 Modified: platform/core/branches/xwiki-core-1.8/xwiki-core/src/main/java/com/xpn/xwiki/render/filter/XWikiHeadingFilter.java Log: XWIKI-3360 Including a document with first or second heading level breaks the including document section edit links (Syntax 1.0) Internal count of section was incremented for headings of included documents while they are not part of the document and thus not subject to section edit in an included context. In doubt I left the comment related to the increment, though I am not sure it is relevant. Modified: platform/core/branches/xwiki-core-1.8/xwiki-core/src/main/java/com/xpn/xwiki/render/filter/XWikiHeadingFilter.java =================================================================== --- platform/core/branches/xwiki-core-1.8/xwiki-core/src/main/java/com/xpn/xwiki/render/filter/XWikiHeadingFilter.java 2009-03-14 15:43:17 UTC (rev 17628) +++ platform/core/branches/xwiki-core-1.8/xwiki-core/src/main/java/com/xpn/xwiki/render/filter/XWikiHeadingFilter.java 2009-03-14 22:32:39 UTC (rev 17629) @@ -158,15 +158,15 @@ } if (level.equals("1") || level.equals("1.1")) { - // TODO: This is unstable, meaning that it works in the current skin, but it might - // fail if there are other headings processed before the document content. - sectionNumber++; // This check is needed so that only the document content generates sectionedit // links. // TODO: Find a better way to make this check, as this prevents generating links for // titles that are transformed by velocity (1.1 about $doc.fullName) or by radeox // (1.1 This is *important*). if (doc != null && doc.getContent().indexOf(title.trim()) != -1) { + // TODO: This is unstable, meaning that it works in the current skin, but it might + // fail if there are other headings processed before the document content. + sectionNumber++; StringBuffer editparams = new StringBuffer(); if (xcontext.getWiki().getEditorPreference(xcontext).equals("wysiwyg")) { editparams.append("xpage=wysiwyg&section=").append(sectionNumber);