Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 1994)
+++ branches/2.8.x/CHANGELOG	(revision 1995)
@@ -11,6 +11,8 @@
 ! = Update/Change
 ===============================================================================
 
+07 Nov-2013 Build 1995 Manuela v.d.Decken(DarkViper)
+# output_filter > filters/filterWbLink solved Entity problem by splitting arguments
 06 Nov-2013 Build 1994 Manuela v.d.Decken(DarkViper)
 + /module/news/WbLink.php  added Interface class to module news
 ! ../fck_wbmodules.php & ../wbmodules.htt modified link generation for news module
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php	(revision 1994)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 1995)
@@ -51,5 +51,5 @@
 
 // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
 if(!defined('VERSION')) define('VERSION', '2.8.3');
-if(!defined('REVISION')) define('REVISION', '1994');
+if(!defined('REVISION')) define('REVISION', '1995');
 if(!defined('SP')) define('SP', '');
Index: branches/2.8.x/wb/modules/output_filter/filters/filterWbLink.php
===================================================================
--- branches/2.8.x/wb/modules/output_filter/filters/filterWbLink.php	(revision 1994)
+++ branches/2.8.x/wb/modules/output_filter/filters/filterWbLink.php	(revision 1995)
@@ -23,7 +23,7 @@
 				if($aMatches[2][$iKey])
 				{
 					$aReplaceList[$sKeyString]['Args'] = array();
-					$aArgs = explode('&', $aMatches[2][$iKey]);
+					$aArgs = preg_split('/&|&/i', $aMatches[2][$iKey], -1, PREG_SPLIT_NO_EMPTY);
 					foreach($aArgs as $sArgument)
 					{
 						$aTmp = explode('=', $sArgument);