### Eclipse Workspace Patch 1.0
#P jahia-root
Index: war/src/main/webapp/engines/shared/category_field.jsp
===================================================================
--- war/src/main/webapp/engines/shared/category_field.jsp	(revision 26817)
+++ war/src/main/webapp/engines/shared/category_field.jsp	(working copy)
@@ -46,5 +46,5 @@
 
 %>
 <internal:gwtImport module="org.jahia.ajax.gwt.module.categorypicker.CategoryPicker"/>
-<internal:categorySelector selectedCategories="<%=selectedCategories%>" readonly="<%=readOnly%>" locale="<%=elh.getCurrentLanguageCode()%>" autoSelectParent='<%=theField.getDefinition().getItemDefinition().getSelectorOptions().get("autoSelectParent")%>'/>
+<internal:categorySelector startCategoryKey="<%=startCategory%>" multiple="<%=theField.getDefinition().getPropertyDefinition().isMultiple()%>" selectedCategories="<%=selectedCategories%>" readonly="<%=readOnly%>" locale="<%=elh.getCurrentLanguageCode()%>" autoSelectParent='<%=theField.getDefinition().getItemDefinition().getSelectorOptions().get("autoSelectParent")%>'/>
 
Index: taglib/src/main/resources/META-INF/tags/ajax/categoriespicker.tag
===================================================================
--- taglib/src/main/resources/META-INF/tags/ajax/categoriespicker.tag	(revision 26940)
+++ taglib/src/main/resources/META-INF/tags/ajax/categoriespicker.tag	(working copy)
@@ -74,7 +74,7 @@
 <input id="removedCategories" type="hidden" name="removedCategories" value=""/>
 
 <template:gwtJahiaModule id="<%=CategoryPickerEntryPoint.ID%>" jahiaType="<%=CategoryPickerEntryPoint.ID%>"
-                         rootKey="${startCategoryKey}" readonly="${readonly}"/>
+                         rootKey="${startCategoryKey}" readonly="${readonly}" multiple="${multiple}"/>
 <internal:gwtResourceBundle resourceName="org.jahia.engines.categories.categories"
                             aliasResourceName="categories"/>
 <internal:gwtResourceBundle resourceName="org.jahia.engines.categories.title"
Index: core/src/main/java/org/jahia/engines/shared/Category_Field.java
===================================================================
--- core/src/main/java/org/jahia/engines/shared/Category_Field.java	(revision 26917)
+++ core/src/main/java/org/jahia/engines/shared/Category_Field.java	(working copy)
@@ -210,6 +210,10 @@
 
         List<String> defaultSelectedCategories = new ArrayList<String>();
         boolean foundNoSelectionMarker = false;
+        
+        String rootCategoryKey = theField.getDefinition().getItemDefinition().getSelectorOptions().get("root");
+        Category startCategory = (rootCategoryKey != null) ? Category.getCategory(rootCategoryKey, jParams.getUser()) : null;
+        
         String fieldDefaultValue = theField.getDefinition().getDefaultValue();
 
         // the field default value contains a combination of :
@@ -218,7 +222,6 @@
         // [rootCategoryKey]defaultCategoryKey1,defaultCategory2,...
         // the rootCategoryKey part is optional.
 
-        Category startCategory = null;
 
         logger.debug("fieldDefaultValue: " + fieldDefaultValue);
         if ((fieldDefaultValue != null) && !"".equals(fieldDefaultValue)) {
@@ -226,9 +229,6 @@
             int defaultCategoryKeysStartPos = 0;
             if ((fieldDefaultValue.indexOf("]") > 0) &&
                     (fieldDefaultValue.indexOf("[") == 0)) {
-                // we have detected a root category key
-                String rootCategoryKey = fieldDefaultValue.substring(1, fieldDefaultValue.indexOf("]"));
-                startCategory = Category.getCategory(rootCategoryKey, jParams.getUser());
                 defaultCategoryKeysStartPos = fieldDefaultValue.indexOf("]") + 1;
             }