Merge pull request #4835 from Sereza7/XWIKI-20437-2

XWIKI-20437: Wrong order of categories in space administration

Author: tmortagne

xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/src/main/resources/XWiki/ConfigurableClassMacros.xml

@@ -186,6 +186,11 @@
       #set ($discard = $sectionsByName.put($section.id, $section))
     #end
   #end
+  ## The $query variable is used as a basis for the URL used in sections. (search for ${query} )
+  #set ($query = "editor=$escapetool.url(${editor})")
+  #if ($editor != 'globaladmin')
+    #set ($query = $query + "&space=$escapetool.url(${currentSpace})")
+  #end
   #foreach ($appName in $appNames)
     ##
     ## Get the configurable application