Index: modules/field/modules/text/text.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/modules/text/text.test,v
retrieving revision 1.12
diff -u -p -r1.12 text.test
--- modules/field/modules/text/text.test	20 Sep 2009 09:37:09 -0000	1.12
+++ modules/field/modules/text/text.test	26 Sep 2009 20:53:37 -0000
@@ -192,7 +192,7 @@ class TextFieldTestCase extends DrupalWe
     $format_id = db_query("SELECT format FROM {filter_format} WHERE name = :name", array(':name' => $edit['name']))->fetchField();
     $permission = filter_permission_name(filter_format_load($format_id));
     $rid = max(array_keys($this->web_user->roles));
-    user_role_grant_permissions($rid, array($permission), TRUE);
+    user_role_grant_permissions($rid, array($permission));
     $this->drupalLogin($this->web_user);
 
     // Display edition form.
Index: modules/filter/filter.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter/filter.install,v
retrieving revision 1.20
diff -u -p -r1.20 filter.install
--- modules/filter/filter.install	20 Sep 2009 07:32:17 -0000	1.20
+++ modules/filter/filter.install	26 Sep 2009 20:53:37 -0000
@@ -294,7 +294,7 @@ function filter_update_7005() {
   $start_name = 'Plain text';
   $format_name = $start_name;
   while ($format = db_query('SELECT format FROM {filter_format} WHERE name = :name', array(':name' => $format_name))->fetchField()) {
-    $id = empty($id) ? 1 : $id + 1;
+    $id = empty($id) ? 2 : $id + 1;
     $format_name = $start_name . ' ' . $id;
   }
   $fallback_format = new stdClass();