mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged V3.2 to HEAD
19580: Fix for ALF-1612 - set default encoding for create-inline content in Explorer Client to sensible default. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19581 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -20,7 +20,6 @@ package org.alfresco.web.bean.content;
|
|||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.nio.charset.Charset;
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@@ -180,7 +179,8 @@ public abstract class BaseContentWizard extends BaseWizardBean
|
|||||||
}
|
}
|
||||||
if (encoding == null || encoding.length() == 0)
|
if (encoding == null || encoding.length() == 0)
|
||||||
{
|
{
|
||||||
encoding = Charset.defaultCharset().name();
|
// if not configured, set to a sensible default for most character sets
|
||||||
|
encoding = "UTF-8";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return encoding;
|
return encoding;
|
||||||
|
Reference in New Issue
Block a user