Index: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG	(revision 1027)
+++ trunk/CHANGELOG	(revision 1028)
@@ -11,6 +11,8 @@
 ! = Update/Change
 
 ------------------------------------- 2.8.0 -------------------------------------
+03-July-2009 Ruud Eisinga
+#	Fixed the wrong handling of htmlentities in Droplet parameter parsing
 02-July-2009 Matthias Gallas
 +	Added missing fancy_progress.png
 01-July-2009 Matthias Gallas
Index: trunk/wb/modules/droplets/info.php
===================================================================
--- trunk/wb/modules/droplets/info.php	(revision 1027)
+++ trunk/wb/modules/droplets/info.php	(revision 1028)
@@ -14,7 +14,7 @@
 $module_directory = 'droplets';
 $module_name = 'Droplets';
 $module_function = 'tool';
-$module_version = '1.0.0';
+$module_version = '1.0.1';
 $module_platform = '2.8.x';
 $module_author = 'Ruud and pcwacht';
 $module_license = 'GPL';
Index: trunk/wb/modules/droplets/droplets.php
===================================================================
--- trunk/wb/modules/droplets/droplets.php	(revision 1027)
+++ trunk/wb/modules/droplets/droplets.php	(revision 1028)
@@ -19,14 +19,14 @@
 		if (strpos($match,"?")) {
 			list ($droplet,$params) = explode("?",$match);
 			if(!empty($params)) {
-				$params = str_replace("&", "&", $params); // replace & to single &
+				$params = html_entity_decode($params,ENT_COMPAT,DEFAULT_CHARSET); // make sure we can parse the parameters correctly
 				$paramarray = explode("&",$params); //create array of parms as parm=value
 				foreach ($paramarray as $paramelement) {
 					$parameterTemp = explode("=", $paramelement,2);
 					if (count($parameterTemp) == 2)
-						$parameter[$parameterTemp[0]] = $parameterTemp[1];
+						$parameter[$parameterTemp[0]] = htmlentities($parameterTemp[1],ENT_COMPAT,DEFAULT_CHARSET); //re-encode the parameter values
 					else
-						$parameter['parm'] = $parameterTemp[0];
+						$parameter['parm'] = htmlentities($parameterTemp[0],ENT_COMPAT,DEFAULT_CHARSET);
 				}
 			}
 		} else {