--- swftools_orig.module	2008-10-06 18:26:02.000000000 +0200
+++ swftools.module	2009-01-13 15:58:46.000000000 +0100
@@ -1002,7 +1002,7 @@ function swftools_filter($op, $delta = 0
       return t('Substitutes <swf file="filename.flv"> or <swf files="file1.jpg&&file2.jpg"> with embedding code.');
     case 'prepare':
         // replace <swf > with [swf ] to prevent other filters stripping
-        return (preg_replace('/\<(swflist|swf)\s*(.*)>/sU', '[\1 \2]', $text));
+       return (preg_replace('/[\<\[](swflist|swf)\s*(.*)[>\]]/sU', '[\1 \2]', $text));
     case 'process':
       return _swftools_filter_process_text($text);
   }
@@ -1026,7 +1026,7 @@ function _swftools_filter_process_text($
     $swftools_parameters = array('file', 'params', 'flashvars', 'othervars', 'methods', 'files');
     $match_vars = array();
     foreach ($match[2] as $key => $passed_parameters) {
-      preg_match_all('/\s+?(\w*)=[\"](.*?)[\"]#?/', $passed_parameters, $match_vars[$key]);
+       preg_match_all('/\s+?(\w*)=(?:\"|&quot;)(.*?)(?:\"|&quot;)#?/', $passed_parameters, $match_vars[$key]);
       // $match_vars[0][#] .... fully matched string
       // $match_vars[1][#] .... matched parameter, eg flashvars, params
       // $match_vars[2][#] .... value after the '='
