merge

git-svn-id: https://svn.potix.com/svn/zk1/releases/5.0.4@15249 dd50bd9b-9913-0410-b9ba-e07a3075be86

zk/src/org/zkoss/zk/ui/impl/DesktopImpl.java

@@ -258,10 +258,11 @@ private static String getQueryString(Object request) {
 		}
 		return null;
 	}
+	private static final String DESKTOP_ID_PREFIX = "zd_";
 	private static String nextDesktopId(DesktopCache dc) {
 		if (dc != null)
 			return Strings.encode(
-				new StringBuffer(12).append("zd_"), dc.getNextKey()).toString();
+				new StringBuffer(12).append(DESKTOP_ID_PREFIX), dc.getNextKey()).toString();
 
 		final int v;
 		synchronized (DesktopImpl.class) {
@@ -280,8 +281,11 @@ private void init() {
 	}
 	/** Updates _uuidPrefix based on _id. */
 	private void updateUuidPrefix() {
-		_uuidPrefix = _id.substring(1, _id.length() <= 2 ? 2: 3);
-			//the first few chars because of the encode's algorithm
+		String id = _id.startsWith(DESKTOP_ID_PREFIX) ?
+			_id.substring(DESKTOP_ID_PREFIX.length()): _id;
+		final int len = id.length();
+		_uuidPrefix = len > 3 ? id.substring(0, 3): id;
+			//since _id's first few character is changed first, we pick the first few
 	}
 
 	public String getId() {

zkdoc/release-note

@@ -114,6 +114,7 @@ ZK 5.0.4
   3054784: Native parameter in Button.setUpload() is not effective
   3057311: Select list fires a unnecessary onSelect on IE
   3057288: Listbox in ROD, the items will disappear
+  3058547: In Liferay, if page has two portlet,  won't work 
 
 * Upgrade Notes
   + The default value of tabindex is changed from -1 to 0.