Skip to content
Browse files

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

  • Loading branch information...
2 parents ffcd01a + 30544c4 commit adf7b9f9686c8950195f1c8463edef9f281777e7 @mflorea mflorea committed Apr 3, 2012
View
2 ...tform-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);
View
2 ...orm-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'))

0 comments on commit adf7b9f

Please sign in to comment.
Something went wrong with that request. Please try again.