### Eclipse Workspace Patch 1.0
#P Drupal
Index: modules/filter/filter.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter/filter.test,v
retrieving revision 1.67
diff -u -r1.67 filter.test
--- modules/filter/filter.test	26 May 2010 10:54:30 -0000	1.67
+++ modules/filter/filter.test	28 May 2010 06:14:33 -0000
@@ -912,6 +912,9 @@
 
     $f = _filter_html('<p onerror="alert(0);" />', $filter);
     $this->assertNoNormalized($f, 'onerror', t('HTML filter should remove on* attributes on default.'));
+
+    $f = _filter_html('<code onerror>&nbsp;</code>', $filter);    
+    $this->assertNoNormalized($f, 'onerror', t('HTML filter should remove empty on* attributes on default.'));
   }
 
   /**
Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.1174
diff -u -r1.1174 common.inc
--- includes/common.inc	26 May 2010 19:51:01 -0000	1.1174
+++ includes/common.inc	28 May 2010 06:14:32 -0000
@@ -1436,7 +1436,7 @@
   }
 
   // The attribute list ends with a valueless attribute like "selected".
-  if ($mode == 1) {
+  if ($mode == 1 && !$skip) {
     $attrarr[] = $attrname;
   }
   return $attrarr;