Index: misc/vertical-tabs.js
===================================================================
RCS file: /cvs/drupal/drupal/misc/vertical-tabs.js,v
retrieving revision 1.7
diff -u -p -r1.7 vertical-tabs.js
--- misc/vertical-tabs.js	31 Aug 2009 05:51:08 -0000	1.7
+++ misc/vertical-tabs.js	11 Jan 2010 18:50:54 -0000
@@ -41,7 +41,9 @@ Drupal.behaviors.verticalTabs = {
       if (!focus) {
         focus = $('> .vertical-tabs-pane:first', this);
       }
-      focus.data('verticalTab').focus();
+      if (focus.length) {
+        focus.data('verticalTab').focus();
+      }
     });
   }
 };
Index: modules/block/block.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/block/block.test,v
retrieving revision 1.34
diff -u -p -r1.34 block.test
--- modules/block/block.test	9 Jan 2010 23:03:21 -0000	1.34
+++ modules/block/block.test	11 Jan 2010 18:50:54 -0000
@@ -20,8 +20,13 @@ class BlockTestCase extends DrupalWebTes
   function setUp() {
     parent::setUp();
 
-    // Create and login user
-    $admin_user = $this->drupalCreateUser(array('administer blocks', 'administer filters', 'access administration pages'));
+    // Create and login administrative user having access to Full HTML text
+    // format in standard install profile (id 2).
+    $admin_user = $this->drupalCreateUser(array(
+      'administer blocks',
+      filter_permission_name(2),
+      'access administration pages',
+    ));
     $this->drupalLogin($admin_user);
 
     // Define the existing regions
Index: modules/filter/filter.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter/filter.module,v
retrieving revision 1.314
diff -u -p -r1.314 filter.module
--- modules/filter/filter.module	28 Dec 2009 21:52:13 -0000	1.314
+++ modules/filter/filter.module	11 Jan 2010 18:50:54 -0000
@@ -267,8 +267,7 @@ function filter_admin_format_title($form
  */
 function filter_permission() {
   $perms['administer filters'] = array(
-    'title' => t('Administer and use any text formats and filters'),
-    'description' => drupal_placeholder(array('text' => t('Warning: This permission may have security implications depending on how the text format is configured.'))),
+    'title' => t('Administer text formats and filters'),
   );
 
   // Generate permissions for each text format. Warn the administrator that any
@@ -292,14 +291,22 @@ function filter_permission() {
  * Returns the machine-readable permission name for a provided text format.
  *
  * @param $format
- *   An object representing a text format.
+ *   An object representing a text format or an internal text format id.
+ *
  * @return
  *   The machine-readable permission name, or FALSE if the provided text format
  *   is malformed or is the fallback format (which is available to all users).
  */
 function filter_permission_name($format) {
-  if (isset($format->format) && $format->format != filter_fallback_format()) {
-    return 'use text format ' . $format->format;
+  if (is_object($format)) {
+    if (isset($format->format) && $format->format != filter_fallback_format()) {
+      return 'use text format ' . $format->format;
+    }
+  }
+  elseif (is_numeric($format)) {
+    if ($format != filter_fallback_format()) {
+      return 'use text format ' . $format;
+    }
   }
   return FALSE;
 }
@@ -738,8 +745,8 @@ function filter_access($format, $account
     $account = $user;
   }
   // Handle special cases up front. All users have access to the fallback
-  // format, and administrators have access to all formats.
-  if (user_access('administer filters', $account) || $format->format == filter_fallback_format()) {
+  // format.
+  if ($format->format == filter_fallback_format()) {
     return TRUE;
   }
   // Check the permission if one exists; otherwise, we have a non-existent
Index: modules/filter/filter.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter/filter.test,v
retrieving revision 1.55
diff -u -p -r1.55 filter.test
--- modules/filter/filter.test	10 Jan 2010 22:56:51 -0000	1.55
+++ modules/filter/filter.test	11 Jan 2010 18:53:48 -0000
@@ -168,7 +168,11 @@ class FilterAdminTestCase extends Drupal
     parent::setUp();
 
     // Create users.
-    $this->admin_user = $this->drupalCreateUser(array('administer filters'));
+    $this->admin_user = $this->drupalCreateUser(array(
+      'administer filters',
+      filter_permission_name(1),
+      filter_permission_name(2),
+    ));
     $this->web_user = $this->drupalCreateUser(array('create page content', 'edit own page content'));
     $this->drupalLogin($this->admin_user);
   }
Index: modules/search/search.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/search/search.test,v
retrieving revision 1.50
diff -u -p -r1.50 search.test
--- modules/search/search.test	10 Jan 2010 22:56:51 -0000	1.50
+++ modules/search/search.test	11 Jan 2010 18:50:54 -0000
@@ -490,7 +490,15 @@ class SearchCommentTestCase extends Drup
   function setUp() {
     parent::setUp('comment', 'search');
 
-    $this->admin_user = $this->drupalCreateUser(array('administer filters', 'administer permissions', 'create page content', 'post comments without approval'));
+    // Create and login administrative user having access to Full HTML text
+    // format in standard install profile (id 2).
+    $this->admin_user = $this->drupalCreateUser(array(
+      'administer filters',
+      filter_permission_name(2),
+      'administer permissions',
+      'create page content',
+      'post comments without approval',
+    ));
     $this->drupalLogin($this->admin_user);
   }