Merge branch 'master' of github.com:xwiki/xwiki-platform

xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/objects/BaseCollection.java

@@ -192,7 +192,7 @@ public void setXClassReference(EntityReference xClassReference)
         EntityReference ref = xClassReference;
 
         if (ref != null) {
-            WikiReference wiki = (WikiReference) xClassReference.extractReference(EntityType.WIKI);
+            EntityReference wiki = xClassReference.extractReference(EntityType.WIKI);
             if (wiki != null) {
                 ref = xClassReference.removeParent(wiki);
 

xwiki-platform-core/xwiki-platform-workspace/xwiki-platform-workspace-ui/src/main/resources/WorkspaceManager/Install.xml

@@ -57,7 +57,7 @@
   #set ($searchSuggestConfigObject = $searchSuggestConfigDocument.getObject('XWiki.SearchSuggestSourceClass', 'name', 'Workspaces'))
   #if (!$searchSuggestConfigObject)
     #if ($hasGlobalAdmin)
-      #set ($searchSuggestConfigObject = $searchSuggestConfigDocument.newObject("$wikiName:XWiki.SearchSuggestSourceClass"))
+      #set ($searchSuggestConfigObject = $searchSuggestConfigDocument.newObject('XWiki.SearchSuggestSourceClass'))
       #set ($discard = $searchSuggestConfigObject.set('name', 'Workspaces'))
       #set ($discard = $searchSuggestConfigObject.set('query', 'XWiki.XWikiServerClass.wikiprettyname:__INPUT__* AND object:WorkspaceManager.WorkspaceClass'))
       #set ($discard = $searchSuggestConfigObject.set('resultsNumber', '3'))