r1329 - xwiki/trunk/src/main/java/com/xpn/xwiki/render/filter

[Phung Hai Nam]

Author: namphunghai
Date: 2006-09-20 04:44:42 +0200 (Wed, 20 Sep 2006)
New Revision: 1329

Modified:
   xwiki/trunk/src/main/java/com/xpn/xwiki/render/filter/XWikiHeadingFilter.java
Log:
XWIKI-356. Fixed  a bug with multilingual  in section editing

Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/render/filter/XWikiHeadingFilter.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/render/filter/XWikiHeadingFilter.java	2006-09-19 20:04:26 UTC (rev 1328)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/render/filter/XWikiHeadingFilter.java	2006-09-20 02:44:42 UTC (rev 1329)
@@ -23,6 +23,7 @@
 package com.xpn.xwiki.render.filter;
 
 import com.xpn.xwiki.XWikiContext;
+import com.xpn.xwiki.XWikiException;
 import com.xpn.xwiki.doc.XWikiDocument;
 import com.xpn.xwiki.render.XWikiRadeoxRenderEngine;
 import com.xpn.xwiki.util.TOCGenerator;
@@ -130,12 +131,20 @@
             if (level.equals("1") || level.equals("1.1") ) {
                 if(doc.getContent().indexOf(title.trim()) != -1) {
                     sectionNumber++;
-                    String url = xcontext.getDoc().getURL("edit",xcontext);
-                    if(xcontext.getWiki().getEditorPreference(xcontext).equals("wysiwyg")) {
-                        url += "?xpage=wysiwyg&section=" + sectionNumber;
-                    } else {
-                        url +="?section=" + sectionNumber;
-                    }
+                    String editparams = "";
+                    if (xcontext.getWiki().getEditorPreference(xcontext).equals("wysiwyg"))
+                        editparams += "xpage=wysiwyg&section=" + sectionNumber;
+                    else
+                        editparams += "section=" + sectionNumber;
+                    try {
+                        if ((xcontext.getWiki().isMultiLingual(xcontext)) && (doc.getRealLanguage(xcontext) != null)) {
+                             String languageParam = "language=" + doc.getRealLanguage(xcontext);
+                            editparams = languageParam + "&" + editparams;
+                        }
+                    } catch (XWikiException e) { }
+
+                    String url = doc.getURL("edit", editparams, xcontext);
+
                     return heading + "<span style='float:right;margin-left:5px;margin-right:5px;'>&#91;<a style='text-decoration: none;' title='Edit section: "+text+"' href='"+ url+"'>"+"edit"+"</a>&#93;</span>";
                 }
             }