? drupal-193897-7.patch
? drupal-193897-9.patch
? sites/default/files
? sites/default/settings.php
Index: modules/aggregator/aggregator.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.module,v
retrieving revision 1.405
diff -u -p -r1.405 aggregator.module
--- modules/aggregator/aggregator.module	1 Mar 2009 07:21:02 -0000	1.405
+++ modules/aggregator/aggregator.module	31 Mar 2009 06:06:58 -0000
@@ -141,13 +141,13 @@ function aggregator_menu() {
   $items['aggregator'] = array(
     'title' => 'Feed aggregator',
     'page callback' => 'aggregator_page_last',
-    'access arguments' => array('access news feeds'),
+    'access arguments' => array('view news feeds'),
     'weight' => 5,
   );
   $items['aggregator/sources'] = array(
     'title' => 'Sources',
     'page callback' => 'aggregator_page_sources',
-    'access arguments' => array('access news feeds'),
+    'access arguments' => array('view news feeds'),
   );
   $items['aggregator/categories'] = array(
     'title' => 'Categories',
@@ -157,13 +157,13 @@ function aggregator_menu() {
   $items['aggregator/rss'] = array(
     'title' => 'RSS feed',
     'page callback' => 'aggregator_page_rss',
-    'access arguments' => array('access news feeds'),
+    'access arguments' => array('view news feeds'),
     'type' => MENU_CALLBACK,
   );
   $items['aggregator/opml'] = array(
     'title' => 'OPML feed',
     'page callback' => 'aggregator_page_opml',
-    'access arguments' => array('access news feeds'),
+    'access arguments' => array('view news feeds'),
     'type' => MENU_CALLBACK,
   );
   $items['aggregator/categories/%aggregator_category'] = array(
@@ -172,7 +172,7 @@ function aggregator_menu() {
     'page callback' => 'aggregator_page_category',
     'page arguments' => array(2),
     'access callback' => 'user_access',
-    'access arguments' => array('access news feeds'),
+    'access arguments' => array('view news feeds'),
   );
   $items['aggregator/categories/%aggregator_category/view'] = array(
     'title' => 'View',
@@ -197,7 +197,7 @@ function aggregator_menu() {
   $items['aggregator/sources/%aggregator_feed'] = array(
     'page callback' => 'aggregator_page_source',
     'page arguments' => array(2),
-    'access arguments' => array('access news feeds'),
+    'access arguments' => array('view news feeds'),
     'type' => MENU_CALLBACK,
   );
   $items['aggregator/sources/%aggregator_feed/view'] = array(
@@ -262,7 +262,7 @@ function aggregator_init() {
  *   TRUE if there is at least one category and the user has access to them, FALSE otherwise.
  */
 function _aggregator_has_categories() {
-  return user_access('access news feeds') && db_query('SELECT COUNT(*) FROM {aggregator_category}')->fetchField();
+  return user_access('view news feeds') && db_query('SELECT COUNT(*) FROM {aggregator_category}')->fetchField();
 }
 
 /**
@@ -274,8 +274,8 @@ function aggregator_perm() {
       'title' => t('Administer news feeds'),
       'description' => t('Add, edit or delete news feeds that are aggregated to your site.'),
     ),
-    'access news feeds' => array(
-      'title' => t('Access news feeds'),
+    'view news feeds' => array(
+      'title' => t('View news feeds'),
       'description' => t('View aggregated news feed items.'),
     ),
   );
@@ -345,7 +345,7 @@ function aggregator_block_save($delta = 
  * Generates blocks for the latest news items in each category and feed.
  */
 function aggregator_block_view($delta = '') {
-  if (user_access('access news feeds')) {
+  if (user_access('view news feeds')) {
     $block = array();
     list($type, $id) = explode('-', $delta);
     switch ($type) {
Index: modules/aggregator/aggregator.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.test,v
retrieving revision 1.20
diff -u -p -r1.20 aggregator.test
--- modules/aggregator/aggregator.test	31 Mar 2009 01:49:50 -0000	1.20
+++ modules/aggregator/aggregator.test	31 Mar 2009 06:06:58 -0000
@@ -6,7 +6,7 @@ class AggregatorTestCase extends DrupalW
 
   function setUp() {
     parent::setUp('aggregator', 'aggregator_test');
-    $web_user = $this->drupalCreateUser(array('administer news feeds', 'access news feeds', 'create article content'));
+    $web_user = $this->drupalCreateUser(array('administer news feeds', 'view news feeds', 'create article content'));
     $this->drupalLogin($web_user);
   }
 
Index: modules/aggregator/aggregator_test.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator_test.module,v
retrieving revision 1.2
diff -u -p -r1.2 aggregator_test.module
--- modules/aggregator/aggregator_test.module	15 Mar 2009 18:59:05 -0000	1.2
+++ modules/aggregator/aggregator_test.module	31 Mar 2009 06:06:58 -0000
@@ -9,7 +9,7 @@ function aggregator_test_menu() {
     'title' => 'Test feed static last modified date',
     'description' => "A cached test feed with a static last modified date.",
     'page callback' => 'aggregator_test_feed',
-    'access arguments' => array('access content'),
+    'access arguments' => array('view content'),
     'type' => MENU_CALLBACK,
   );
   return $items;
Index: modules/blog/blog.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/blog/blog.module,v
retrieving revision 1.317
diff -u -p -r1.317 blog.module
--- modules/blog/blog.module	8 Mar 2009 04:25:03 -0000	1.317
+++ modules/blog/blog.module	31 Mar 2009 06:06:58 -0000
@@ -119,7 +119,7 @@ function blog_menu() {
   $items['blog'] = array(
     'title' => 'Blogs',
     'page callback' => 'blog_page_last',
-    'access arguments' => array('access content'),
+    'access arguments' => array('view content'),
     'type' => MENU_SUGGESTED_ITEM,
   );
   $items['blog/%user_uid_optional'] = array(
@@ -140,7 +140,7 @@ function blog_menu() {
   $items['blog/feed'] = array(
     'title' => 'Blogs',
     'page callback' => 'blog_feed_last',
-    'access arguments' => array('access content'),
+    'access arguments' => array('view content'),
     'type' => MENU_CALLBACK,
   );
 
@@ -154,7 +154,7 @@ function blog_page_user_access($account)
   // The visitor must be able to access the site's content.
   // For a blog to 'exist' the user must either be able to
   // create new blog entries, or it must have existing posts.
-  return $account->uid && user_access('access content') && (user_access('create blog content', $account) || _blog_post_exists($account));
+  return $account->uid && user_access('view content') && (user_access('create blog content', $account) || _blog_post_exists($account));
 }
 
 /**
@@ -180,7 +180,7 @@ function blog_block_list() {
 function blog_block_view($delta = '') {
   global $user;
 
-  if (user_access('access content')) {
+  if (user_access('view content')) {
     $result = db_query_range(db_rewrite_sql("SELECT n.nid, n.title, n.created FROM {node} n WHERE n.type = 'blog' AND n.status = 1 ORDER BY n.created DESC"), 0, 10);
     if ($node_title_list = node_title_list($result)) {
       $block['content'] = $node_title_list;
Index: modules/blogapi/blogapi.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/blogapi/blogapi.module,v
retrieving revision 1.146
diff -u -p -r1.146 blogapi.module
--- modules/blogapi/blogapi.module	17 Mar 2009 12:41:54 -0000	1.146
+++ modules/blogapi/blogapi.module	31 Mar 2009 06:06:59 -0000
@@ -815,7 +815,7 @@ function blogapi_menu() {
   $items['blogapi/rsd'] = array(
     'title' => 'RSD',
     'page callback' => 'blogapi_rsd',
-    'access arguments' => array('access content'),
+    'access arguments' => array('view content'),
     'type' => MENU_CALLBACK,
   );
   $items['admin/settings/blogapi'] = array(
Index: modules/book/book.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/book/book.install,v
retrieving revision 1.27
diff -u -p -r1.27 book.install
--- modules/book/book.install	19 Jan 2009 10:46:50 -0000	1.27
+++ modules/book/book.install	31 Mar 2009 06:06:59 -0000
@@ -87,7 +87,7 @@ function book_update_6000() {
       'create book pages' => 'create book content',
       'edit book pages' => 'edit any book content',
       'edit own book pages' => 'edit own book content',
-      'see printer-friendly version' => 'access printer-friendly version',
+      'see printer-friendly version' => 'view printer-friendly version',
     );
 
     // Loop over all the roles, and do the necessary transformations.
Index: modules/book/book.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/book/book.module,v
retrieving revision 1.488
diff -u -p -r1.488 book.module
--- modules/book/book.module	30 Mar 2009 05:40:44 -0000	1.488
+++ modules/book/book.module	31 Mar 2009 06:06:59 -0000
@@ -53,8 +53,8 @@ function book_perm() {
       'title' => t('Add content to books'),
       'description' => t('Add new content and child pages to books.'),
     ),
-    'access printer-friendly version' => array(
-      'title' => t('Access printer-friendly version'),
+    'view printer-friendly version' => array(
+      'title' => t('View printer-friendly version'),
       'description' => t('View a book page and all of its sub-pages as a single document for ease of printing. Can be performance heavy.'),
     ),
   );
@@ -77,7 +77,7 @@ function book_node_view_link($node, $tea
         );
       }
 
-      if (user_access('access printer-friendly version')) {
+      if (user_access('view printer-friendly version')) {
         $links['book_printer'] = array(
           'title' => t('Printer-friendly version'),
           'href' => 'book/export/html/' . $node->nid,
@@ -128,13 +128,13 @@ function book_menu() {
   $items['book'] = array(
     'title' => 'Books',
     'page callback' => 'book_render',
-    'access arguments' => array('access content'),
+    'access arguments' => array('view content'),
     'type' => MENU_SUGGESTED_ITEM,
   );
   $items['book/export/%/%'] = array(
     'page callback' => 'book_export',
     'page arguments' => array(2, 3),
-    'access arguments' => array('access printer-friendly version'),
+    'access arguments' => array('view printer-friendly version'),
     'type' => MENU_CALLBACK,
   );
   $items['node/%node/outline'] = array(
@@ -156,7 +156,7 @@ function book_menu() {
   );
   $items['book/js/form'] = array(
     'page callback' => 'book_form_update',
-    'access arguments' => array('access content'),
+    'access arguments' => array('view content'),
     'type' => MENU_CALLBACK,
   );
 
Index: modules/book/book.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/book/book.pages.inc,v
retrieving revision 1.14
diff -u -p -r1.14 book.pages.inc
--- modules/book/book.pages.inc	14 Mar 2009 20:13:26 -0000	1.14
+++ modules/book/book.pages.inc	31 Mar 2009 06:06:59 -0000
@@ -71,7 +71,7 @@ function book_export($type, $nid) {
  *   the book hierarchy.
  */
 function book_export_html($nid) {
-  if (user_access('access printer-friendly version')) {
+  if (user_access('view printer-friendly version')) {
     $export_data = array();
     $node = node_load($nid);
     if (isset($node->book)) {
Index: modules/book/book.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/book/book.test,v
retrieving revision 1.8
diff -u -p -r1.8 book.test
--- modules/book/book.test	31 Mar 2009 01:49:50 -0000	1.8
+++ modules/book/book.test	31 Mar 2009 06:06:59 -0000
@@ -22,7 +22,7 @@ class BookTestCase extends DrupalWebTest
   function testBook() {
     // Create users.
     $book_author = $this->drupalCreateUser(array('create new books', 'create book content', 'edit own book content', 'add content to books'));
-    $web_user = $this->drupalCreateUser(array('access printer-friendly version'));
+    $web_user = $this->drupalCreateUser(array('view printer-friendly version'));
 
     // Create new book.
     $this->drupalLogin($book_author);
Index: modules/comment/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v
retrieving revision 1.700
diff -u -p -r1.700 comment.module
--- modules/comment/comment.module	17 Mar 2009 12:41:54 -0000	1.700
+++ modules/comment/comment.module	31 Mar 2009 06:06:59 -0000
@@ -242,8 +242,8 @@ function comment_perm() {
       'title' => t('Administer comments'),
       'description' => t('Manage and approve comments, and configure comment administration settings.'),
     ),
-    'access comments' => array(
-      'title' => t('Access comments'),
+    'view comments' => array(
+      'title' => t('View comments'),
       'description' => t('View comments attached to content.'),
     ),
     'post comments' => array(
@@ -294,7 +294,7 @@ function comment_block_save($delta = '',
  * Generates a block with the most recent comments.
  */
 function comment_block_view($delta = '') {
-  if (user_access('access comments')) {
+  if (user_access('view comments')) {
     $block['subject'] = t('Recent comments');
     $block['content'] = theme('comment_block');
 
@@ -422,7 +422,7 @@ function comment_node_view($node, $tease
   if ($node->comment) {
     if ($teaser) {
       // Main page: display the number of comments that have been posted.
-      if (user_access('access comments')) {
+      if (user_access('view comments')) {
         if (!empty($node->comment_count)) {
           $links['comment_comments'] = array(
             'title' => format_plural($node->comment_count, '1 comment', '@count comments'),
@@ -1084,7 +1084,7 @@ function comment_render($node, $cid = 0)
   global $user;
   $output = '';
 
-  if (user_access('access comments')) {
+  if (user_access('view comments')) {
     // Pre-process variables.
     $nid = $node->nid;
     if (empty($nid)) {
Index: modules/comment/comment.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.pages.inc,v
retrieving revision 1.16
diff -u -p -r1.16 comment.pages.inc
--- modules/comment/comment.pages.inc	17 Mar 2009 12:41:54 -0000	1.16
+++ modules/comment/comment.pages.inc	31 Mar 2009 06:06:59 -0000
@@ -33,7 +33,7 @@ function comment_edit($cid) {
  *   - replies to comments
  *   - replies to nodes
  *   - attempts to reply to nodes that can no longer accept comments
- *   - respecting access permissions ('access comments', 'post comments', etc.)
+ *   - respecting access permissions ('view comments', 'post comments', etc.)
  *
  * The node or comment that is being replied to must appear above the comment
  * form to provide the user context while authoring the comment.
@@ -54,7 +54,7 @@ function comment_reply($node, $pid = NUL
   $op = isset($_POST['op']) ? $_POST['op'] : '';
   $output = '';
 
-  if (user_access('access comments')) {
+  if (user_access('view comments')) {
     // The user is previewing a comment prior to submitting it.
     if ($op == t('Preview')) {
       if (user_access('post comments')) {
@@ -91,7 +91,7 @@ function comment_reply($node, $pid = NUL
         }
       }
       // This is the case where the comment is in response to a node. Display the node.
-      elseif (user_access('access content')) {
+      elseif (user_access('view content')) {
         $output .= drupal_render(node_build($node));
       }
 
Index: modules/comment/comment.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.test,v
retrieving revision 1.28
diff -u -p -r1.28 comment.test
--- modules/comment/comment.test	31 Mar 2009 01:49:50 -0000	1.28
+++ modules/comment/comment.test	31 Mar 2009 06:06:59 -0000
@@ -10,7 +10,7 @@ class CommentHelperCase extends DrupalWe
     parent::setUp('comment');
     // Create users.
     $this->admin_user = $this->drupalCreateUser(array('administer content types', 'administer comments', 'administer permissions', 'administer blocks'));
-    $this->web_user = $this->drupalCreateUser(array('access comments', 'post comments', 'create article content'));
+    $this->web_user = $this->drupalCreateUser(array('view comments', 'post comments', 'create article content'));
 
     $this->drupalLogin($this->web_user);
     $this->node = $this->drupalCreateNode(array('type' => 'article', 'promote' => 1));
@@ -171,7 +171,7 @@ class CommentHelperCase extends DrupalWe
    */
   function setAnonymousUserComment($enabled, $without_approval) {
     $edit = array();
-    $edit['1[access comments]'] = $enabled;
+    $edit['1[view comments]'] = $enabled;
     $edit['1[post comments]'] = $enabled;
     $edit['1[post comments without approval]'] = $without_approval;
     $this->drupalPost('admin/user/permissions', $edit, t('Save permissions'));
@@ -571,7 +571,7 @@ class CommentBlockFunctionalTest extends
     $comment2 = $this->postComment($this->node, $this->randomName(), $this->randomName());
     $comment3 = $this->postComment($this->node, '', $this->randomName());
 
-    // Test that a user without the 'access comments' permission can not see the block.
+    // Test that a user without the 'view comments' permission can not see the block.
     $this->drupalLogout();
     $this->drupalGet('');
     $this->assertNoText($block['title'], t('Block was not found.'));
Index: modules/dblog/dblog.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/dblog/dblog.module,v
retrieving revision 1.36
diff -u -p -r1.36 dblog.module
--- modules/dblog/dblog.module	13 Mar 2009 14:28:18 -0000	1.36
+++ modules/dblog/dblog.module	31 Mar 2009 06:06:59 -0000
@@ -54,7 +54,7 @@ function dblog_menu() {
     'title' => 'Recent log entries',
     'description' => 'View events that have recently been logged.',
     'page callback' => 'dblog_overview',
-    'access arguments' => array('access site reports'),
+    'access arguments' => array('view site reports'),
     'weight' => -1,
   );
   $items['admin/reports/page-not-found'] = array(
@@ -62,20 +62,20 @@ function dblog_menu() {
     'description' => "View 'page not found' errors (404s).",
     'page callback' => 'dblog_top',
     'page arguments' => array('page not found'),
-    'access arguments' => array('access site reports'),
+    'access arguments' => array('view site reports'),
   );
   $items['admin/reports/access-denied'] = array(
     'title' => "Top 'access denied' errors",
     'description' => "View 'access denied' errors (403s).",
     'page callback' => 'dblog_top',
     'page arguments' => array('access denied'),
-    'access arguments' => array('access site reports'),
+    'access arguments' => array('view site reports'),
   );
   $items['admin/reports/event/%'] = array(
     'title' => 'Details',
     'page callback' => 'dblog_event',
     'page arguments' => array(3),
-    'access arguments' => array('access site reports'),
+    'access arguments' => array('view site reports'),
     'type' => MENU_CALLBACK,
   );
   return $items;
Index: modules/dblog/dblog.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/dblog/dblog.test,v
retrieving revision 1.17
diff -u -p -r1.17 dblog.test
--- modules/dblog/dblog.test	31 Mar 2009 01:49:51 -0000	1.17
+++ modules/dblog/dblog.test	31 Mar 2009 06:06:59 -0000
@@ -19,7 +19,7 @@ class DBLogTestCase extends DrupalWebTes
   function setUp() {
     parent::setUp('dblog', 'blog', 'poll');
     // Create users.
-    $this->big_user = $this->drupalCreateUser(array('administer site configuration', 'access administration pages', 'access site reports', 'administer users'));
+    $this->big_user = $this->drupalCreateUser(array('administer site configuration', 'access administration pages', 'view site reports', 'administer users'));
     $this->any_user = $this->drupalCreateUser(array());
   }
 
Index: modules/field/field.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/field.module,v
retrieving revision 1.7
diff -u -p -r1.7 field.module
--- modules/field/field.module	26 Mar 2009 13:31:24 -0000	1.7
+++ modules/field/field.module	31 Mar 2009 06:07:00 -0000
@@ -128,7 +128,7 @@ function field_menu() {
   // Callback for AHAH add more buttons.
   $items['field/js_add_more'] = array(
     'page callback' => 'field_add_more_js',
-    'access arguments' => array('access content'),
+    'access arguments' => array('view content'),
     'type' => MENU_CALLBACK,
   );
 
Index: modules/forum/forum.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/forum/forum.module,v
retrieving revision 1.489
diff -u -p -r1.489 forum.module
--- modules/forum/forum.module	17 Mar 2009 12:41:54 -0000	1.489
+++ modules/forum/forum.module	31 Mar 2009 06:07:00 -0000
@@ -85,7 +85,7 @@ function forum_menu() {
   $items['forum'] = array(
     'title' => 'Forums',
     'page callback' => 'forum_page',
-    'access arguments' => array('access content'),
+    'access arguments' => array('view content'),
     'type' => MENU_SUGGESTED_ITEM,
   );
   $items['admin/build/forum'] = array(
@@ -498,7 +498,7 @@ function forum_block_save($delta = '', $
  * most recently added forum topics.
  */
 function forum_block_view($delta = '') {
-  if (user_access('access content')) {
+  if (user_access('view content')) {
     switch ($delta) {
       case 'active':
         $title = t('Active forum topics');
Index: modules/menu/menu.api.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/menu/menu.api.php,v
retrieving revision 1.5
diff -u -p -r1.5 menu.api.php
--- modules/menu/menu.api.php	24 Feb 2009 16:02:51 -0000	1.5
+++ modules/menu/menu.api.php	31 Mar 2009 06:07:00 -0000
@@ -71,13 +71,13 @@ function hook_menu() {
   $items['blog'] = array(
     'title' => 'blogs',
     'page callback' => 'blog_page',
-    'access arguments' => array('access content'),
+    'access arguments' => array('view content'),
     'type' => MENU_SUGGESTED_ITEM,
   );
   $items['blog/feed'] = array(
     'title' => 'RSS feed',
     'page callback' => 'blog_feed',
-    'access arguments' => array('access content'),
+    'access arguments' => array('view content'),
     'type' => MENU_CALLBACK,
   );
 
Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.1033
diff -u -p -r1.1033 node.module
--- modules/node/node.module	26 Mar 2009 13:31:25 -0000	1.1033
+++ modules/node/node.module	31 Mar 2009 06:07:00 -0000
@@ -1323,8 +1323,8 @@ function node_perm() {
       'title' => t('Administer nodes'),
       'description' => t('Manage all information associated with site content, such as author, publication date and current revision. %warning', array('%warning' => t('Warning: Give to trusted roles only; this permission has security implications.'))),
     ),
-    'access content' => array(
-      'title' => t('Access content'),
+    'view content' => array(
+      'title' => t('View content'),
       'description' => t('View published content.'),
     ),
     'bypass node access' => array(
@@ -1726,7 +1726,7 @@ function node_menu() {
   $items['node'] = array(
     'title' => 'Content',
     'page callback' => 'node_page_default',
-    'access arguments' => array('access content'),
+    'access arguments' => array('view content'),
     'type' => MENU_CALLBACK,
   );
   $items['node/add'] = array(
@@ -1739,7 +1739,7 @@ function node_menu() {
   $items['rss.xml'] = array(
     'title' => 'RSS feed',
     'page callback' => 'node_feed',
-    'access arguments' => array('access content'),
+    'access arguments' => array('view content'),
     'type' => MENU_CALLBACK,
   );
   foreach (node_get_types('types', NULL, TRUE) as $type) {
@@ -2318,7 +2318,7 @@ function node_access($op, $node, $accoun
     return TRUE;
   }
 
-  if (!user_access('access content', $account)) {
+  if (!user_access('view content', $account)) {
     return FALSE;
   }
 
Index: modules/node/node.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.test,v
retrieving revision 1.19
diff -u -p -r1.19 node.test
--- modules/node/node.test	31 Mar 2009 01:49:52 -0000	1.19
+++ modules/node/node.test	31 Mar 2009 06:07:00 -0000
@@ -459,7 +459,7 @@ class PageViewTestCase extends DrupalWeb
     $this->assertResponse(403);
 
     // Create a user without permission to edit node.
-    $web_user = $this->drupalCreateUser(array('access content'));
+    $web_user = $this->drupalCreateUser(array('view content'));
     $this->drupalLogin($web_user);
 
     // Attempt to access edit page.
@@ -555,7 +555,7 @@ class NodePostSettingsTestCase extends D
   function setUp() {
     parent::setUp();
 
-    $web_user = $this->drupalCreateUser(array('create page content', 'administer content types', 'access user profiles'));
+    $web_user = $this->drupalCreateUser(array('create page content', 'administer content types', 'view user profiles'));
     $this->drupalLogin($web_user);
   }
 
Index: modules/php/php.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/php/php.test,v
retrieving revision 1.8
diff -u -p -r1.8 php.test
--- modules/php/php.test	31 Mar 2009 01:49:53 -0000	1.8
+++ modules/php/php.test	31 Mar 2009 06:07:01 -0000
@@ -56,7 +56,7 @@ class PHPFilterTestCase extends PHPTestC
     $this->assertText(t('The text format settings have been updated.'), t('PHP format available to authenticated users.'));
 
     // Create node with PHP filter enabled.
-    $web_user = $this->drupalCreateUser(array('access content', 'create page content', 'edit own page content'));
+    $web_user = $this->drupalCreateUser(array('view content', 'create page content', 'edit own page content'));
     $this->drupalLogin($web_user);
 
     $node = $this->createNodeWithCode($web_user);
@@ -93,7 +93,7 @@ class PHPAccessTestCase extends PHPTestC
    */
   function testNoPrivileges() {
     // Create node with PHP filter enabled.
-    $web_user = $this->drupalCreateUser(array('access content', 'create page content', 'edit own page content'));
+    $web_user = $this->drupalCreateUser(array('view content', 'create page content', 'edit own page content'));
     $this->drupalLogin($web_user);
 
     $node = $this->createNodeWithCode($web_user);
Index: modules/poll/poll.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/poll/poll.module,v
retrieving revision 1.290
diff -u -p -r1.290 poll.module
--- modules/poll/poll.module	9 Mar 2009 20:36:58 -0000	1.290
+++ modules/poll/poll.module	31 Mar 2009 06:07:01 -0000
@@ -64,8 +64,8 @@ function poll_perm() {
       'title' => t('Cancel own vote'),
       'description' => t('Retract and optionally change own votes.'),
     ),
-    'inspect all votes' => array(
-      'title' => t('Inspect all votes'),
+    'view all votes' => array(
+      'title' => t('View all votes'),
       'description' => t('View voting results.'),
     ),
   );
@@ -94,7 +94,7 @@ function poll_menu() {
   $items['poll'] = array(
     'title' => 'Polls',
     'page callback' => 'poll_page',
-    'access arguments' => array('access content'),
+    'access arguments' => array('view content'),
     'type' => MENU_SUGGESTED_ITEM,
   );
 
@@ -103,7 +103,7 @@ function poll_menu() {
     'page callback' => 'poll_votes',
     'page arguments' => array(1),
     'access callback' => '_poll_menu_access',
-    'access arguments' => array(1, 'inspect all votes', FALSE),
+    'access arguments' => array(1, 'view all votes', FALSE),
     'weight' => 3,
     'type' => MENU_LOCAL_TASK,
   );
@@ -113,7 +113,7 @@ function poll_menu() {
     'page callback' => 'poll_results',
     'page arguments' => array(1),
     'access callback' => '_poll_menu_access',
-    'access arguments' => array(1, 'access content', TRUE),
+    'access arguments' => array(1, 'view content', TRUE),
     'weight' => 3,
     'type' => MENU_LOCAL_TASK,
   );
@@ -132,7 +132,7 @@ function _poll_menu_access($node, $perm,
  * Implementation of hook_block_list().
  */
 function poll_block_list() {
-  if (user_access('access content')) {
+  if (user_access('view content')) {
     $blocks['recent']['info'] = t('Most recent poll');
     return $blocks;
   }
@@ -144,7 +144,7 @@ function poll_block_list() {
  * Generates a block containing the latest poll.
  */
 function poll_block_view($delta = '') {
-  if (user_access('access content')) {
+  if (user_access('view content')) {
     // Retrieve the latest poll.
     $select = db_select('node', 'n');
     $select->join('poll', 'p', 'p.nid = n.nid');
Index: modules/poll/poll.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/poll/poll.test,v
retrieving revision 1.16
diff -u -p -r1.16 poll.test
--- modules/poll/poll.test	31 Mar 2009 01:49:53 -0000	1.16
+++ modules/poll/poll.test	31 Mar 2009 06:07:01 -0000
@@ -14,7 +14,7 @@ class PollTestCase extends DrupalWebTest
   function pollCreate($title, $choices, $test_preview = TRUE) {
     $this->assertTrue(TRUE, 'Create a poll');
 
-    $web_user = $this->drupalCreateUser(array('create poll content', 'access content'));
+    $web_user = $this->drupalCreateUser(array('create poll content', 'view content'));
     $this->drupalLogin($web_user);
 
     // Get the form first to initialize the state of the internal browser
@@ -108,7 +108,7 @@ class PollVoteTestCase extends PollTestC
     $poll_nid = $this->pollCreate($title, $choices, FALSE);
     $this->drupalLogout();
 
-    $web_user = $this->drupalCreateUser(array('cancel own vote', 'inspect all votes', 'vote on polls', 'access content'));
+    $web_user = $this->drupalCreateUser(array('cancel own vote', 'view all votes', 'vote on polls', 'view content'));
     $this->drupalLogin($web_user);
 
     // Record a vote for the first choice.
@@ -175,7 +175,7 @@ class PollJSAddChoice extends DrupalWebT
    * Test adding a new choice.
    */
   function testAddChoice() {
-    $web_user = $this->drupalCreateUser(array('create poll content', 'access content'));
+    $web_user = $this->drupalCreateUser(array('create poll content', 'view content'));
     $this->drupalLogin($web_user);
     $this->drupalGet('node/add/poll');
     $edit = array(
Index: modules/profile/profile.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/profile/profile.module,v
retrieving revision 1.252
diff -u -p -r1.252 profile.module
--- modules/profile/profile.module	14 Mar 2009 23:01:37 -0000	1.252
+++ modules/profile/profile.module	31 Mar 2009 06:07:01 -0000
@@ -79,7 +79,7 @@ function profile_menu() {
   $items['profile'] = array(
     'title' => 'User list',
     'page callback' => 'profile_browse',
-    'access arguments' => array('access user profiles'),
+    'access arguments' => array('view user profiles'),
     'type' => MENU_SUGGESTED_ITEM,
   );
   $items['admin/user/profile'] = array(
@@ -119,7 +119,7 @@ function profile_menu() {
   $items['profile/autocomplete'] = array(
     'title' => 'Profile autocomplete',
     'page callback' => 'profile_autocomplete',
-    'access arguments' => array('access user profiles'),
+    'access arguments' => array('view user profiles'),
     'type' => MENU_CALLBACK,
   );
   return $items;
@@ -166,7 +166,7 @@ function profile_block_save($delta = '',
  * Implementation of hook_block_view().
  */
 function profile_block_view($delta = '') {
-  if (user_access('access user profiles')) {
+  if (user_access('view user profiles')) {
     $output = '';
     if ((arg(0) == 'node') && is_numeric(arg(1)) && (arg(2) == NULL)) {
       $node = node_load(arg(1));
@@ -292,7 +292,7 @@ function profile_view_field($user, $fiel
   // Only allow browsing of private fields for admins, if browsing is enabled,
   // and if a user has permission to view profiles. Note that this check is
   // necessary because a user may always see their own profile.
-  $browse = user_access('access user profiles')
+  $browse = user_access('view user profiles')
          && (user_access('administer users') || $field->visibility != PROFILE_PRIVATE)
          && !empty($field->page);
 
Index: modules/profile/profile.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/profile/profile.test,v
retrieving revision 1.12
diff -u -p -r1.12 profile.test
--- modules/profile/profile.test	31 Mar 2009 01:49:53 -0000	1.12
+++ modules/profile/profile.test	31 Mar 2009 06:07:01 -0000
@@ -12,7 +12,7 @@ class ProfileTestCase extends DrupalWebT
     parent::setUp('profile');
     variable_set('user_register', 1);
 
-    $this->admin_user = $this->drupalCreateUser(array('administer users', 'access user profiles'));
+    $this->admin_user = $this->drupalCreateUser(array('administer users', 'view user profiles'));
 
     // This is the user whose profile will be edited.
     $this->normal_user = $this->drupalCreateUser();
@@ -277,7 +277,7 @@ class ProfileTestAutocomplete extends Pr
     $this->assertResponse(200, t('Autocomplete path allowed to user with permission.'));
     $this->assertRaw($field['value'], t('Autocomplete value found.'));
 
-    // Logout and login with a user without the 'access user profiles' permission.
+    // Logout and login with a user without the 'view user profiles' permission.
     $this->drupalLogout();
     $this->drupalLogin($this->normal_user);
 
Index: modules/search/search.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/search/search.module,v
retrieving revision 1.287
diff -u -p -r1.287 search.module
--- modules/search/search.module	27 Mar 2009 00:16:16 -0000	1.287
+++ modules/search/search.module	31 Mar 2009 06:07:01 -0000
@@ -208,7 +208,7 @@ function search_menu() {
     'description' => 'View most popular search phrases.',
     'page callback' => 'dblog_top',
     'page arguments' => array('search'),
-    'access arguments' => array('access site reports'),
+    'access arguments' => array('view site reports'),
     'file path' => drupal_get_path('module', 'dblog'),
   );
 
Index: modules/search/search.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/search/search.test,v
retrieving revision 1.17
diff -u -p -r1.17 search.test
--- modules/search/search.test	31 Mar 2009 01:49:53 -0000	1.17
+++ modules/search/search.test	31 Mar 2009 06:07:01 -0000
@@ -238,7 +238,7 @@ class SearchAdvancedSearchForm extends D
   function setUp() {
     parent::setUp('search');
     // Create and login user.
-    $test_user = $this->drupalCreateUser(array('access content', 'search content', 'use advanced search', 'administer nodes'));
+    $test_user = $this->drupalCreateUser(array('view content', 'search content', 'use advanced search', 'administer nodes'));
     $this->drupalLogin($test_user);
 
     // Create initial node.
Index: modules/simpletest/drupal_web_test_case.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/drupal_web_test_case.php,v
retrieving revision 1.92
diff -u -p -r1.92 drupal_web_test_case.php
--- modules/simpletest/drupal_web_test_case.php	30 Mar 2009 05:35:35 -0000	1.92
+++ modules/simpletest/drupal_web_test_case.php	31 Mar 2009 06:07:01 -0000
@@ -687,7 +687,7 @@ class DrupalWebTestCase {
   protected function _drupalCreateRole(array $permissions = NULL) {
     // Generate string version of permissions list.
     if ($permissions === NULL) {
-      $permissions = array('access comments', 'access content', 'post comments', 'post comments without approval');
+      $permissions = array('view comments', 'view content', 'post comments', 'post comments without approval');
     }
 
     if (!$this->checkPermissions($permissions)) {
Index: modules/simpletest/simpletest.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/simpletest.test,v
retrieving revision 1.17
diff -u -p -r1.17 simpletest.test
--- modules/simpletest/simpletest.test	31 Mar 2009 01:49:53 -0000	1.17
+++ modules/simpletest/simpletest.test	31 Mar 2009 06:07:02 -0000
@@ -72,7 +72,7 @@ class SimpleTestFunctionalTest extends D
   function testWebTestRunner() {
     $this->pass = t('SimpleTest pass.');
     $this->fail = t('SimpleTest fail.');
-    $this->valid_permission = 'access content';
+    $this->valid_permission = 'view content';
     $this->invalid_permission = 'invalid permission';
 
     if ($this->inCURL()) {
Index: modules/statistics/statistics.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/statistics/statistics.module,v
retrieving revision 1.299
diff -u -p -r1.299 statistics.module
--- modules/statistics/statistics.module	8 Mar 2009 04:25:06 -0000	1.299
+++ modules/statistics/statistics.module	31 Mar 2009 06:07:02 -0000
@@ -83,8 +83,8 @@ function statistics_exit() {
  */
 function statistics_perm() {
   return array(
-    'access statistics' => array(
-      'title' => t('Access statistics'),
+    'view statistics' => array(
+      'title' => t('View statistics'),
       'description' => t('View content access statistics.'),
     ),
     'administer statistics' => array(
@@ -126,34 +126,34 @@ function statistics_menu() {
     'title' => 'Recent hits',
     'description' => 'View pages that have recently been visited.',
     'page callback' => 'statistics_recent_hits',
-    'access arguments' => array('access statistics'),
+    'access arguments' => array('view statistics'),
   );
   $items['admin/reports/pages'] = array(
     'title' => 'Top pages',
     'description' => 'View pages that have been hit frequently.',
     'page callback' => 'statistics_top_pages',
-    'access arguments' => array('access statistics'),
+    'access arguments' => array('view statistics'),
     'weight' => 1,
   );
   $items['admin/reports/visitors'] = array(
     'title' => 'Top visitors',
     'description' => 'View visitors that hit many pages.',
     'page callback' => 'statistics_top_visitors',
-    'access arguments' => array('access statistics'),
+    'access arguments' => array('view statistics'),
     'weight' => 2,
   );
   $items['admin/reports/referrers'] = array(
     'title' => 'Top referrers',
     'description' => 'View top referrers.',
     'page callback' => 'statistics_top_referrers',
-    'access arguments' => array('access statistics'),
+    'access arguments' => array('view statistics'),
   );
   $items['admin/reports/access/%'] = array(
     'title' => 'Details',
     'description' => 'View access log.',
     'page callback' => 'statistics_access_log',
     'page arguments' => array(3),
-    'access arguments' => array('access statistics'),
+    'access arguments' => array('view statistics'),
     'type' => MENU_CALLBACK,
   );
   $items['admin/settings/statistics'] = array(
@@ -167,7 +167,7 @@ function statistics_menu() {
     'title' => 'Track page visits',
     'page callback' => 'statistics_user_tracker',
     'access callback' => 'user_access',
-    'access arguments' => array('access statistics'),
+    'access arguments' => array('view statistics'),
     'type' => MENU_LOCAL_TASK,
     'weight' => 2,
   );
@@ -175,7 +175,7 @@ function statistics_menu() {
     'title' => 'Track',
     'page callback' => 'statistics_node_tracker',
     'access callback' => 'user_access',
-    'access arguments' => array('access statistics'),
+    'access arguments' => array('view statistics'),
     'type' => MENU_LOCAL_TASK,
     'weight' => 2,
   );
@@ -297,7 +297,7 @@ function statistics_block_save($delta = 
  * Implementation of hook_block_view().
  */
 function statistics_block_view($delta = '') {
-  if (user_access('access content')) {
+  if (user_access('view content')) {
     $content = array();
 
     $daytop = variable_get('statistics_block_top_day_num', 0);
Index: modules/statistics/statistics.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/statistics/statistics.test,v
retrieving revision 1.7
diff -u -p -r1.7 statistics.test
--- modules/statistics/statistics.test	31 Mar 2009 01:49:54 -0000	1.7
+++ modules/statistics/statistics.test	31 Mar 2009 06:07:02 -0000
@@ -14,7 +14,7 @@ class StatisticsBlockVisitorsTestCase ex
     parent::setUp('statistics');
 
     // Create user.
-    $this->blocking_user = $this->drupalCreateUser(array('block IP addresses', 'access statistics'));
+    $this->blocking_user = $this->drupalCreateUser(array('block IP addresses', 'view statistics'));
 
     // Insert dummy access by anonymous user into access log.
     db_query("INSERT INTO {accesslog} (title, path, url, hostname, uid, sid, timer, timestamp) values('%s', '%s', '%s', '%s', %d, '%s', %d, %d)", 'test', 'node/1', 'http://example.com', '192.168.1.1', '0', '10', '10', REQUEST_TIME);
Index: modules/system/system.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.install,v
retrieving revision 1.312
diff -u -p -r1.312 system.install
--- modules/system/system.install	17 Mar 2009 15:26:29 -0000	1.312
+++ modules/system/system.install	31 Mar 2009 06:07:02 -0000
@@ -359,11 +359,11 @@ function system_install() {
   db_query("INSERT INTO {role} (name) VALUES ('%s')", 'authenticated user');
 
   // Anonymous role permissions.
-  db_query("INSERT INTO {role_permission} (rid, permission) VALUES (%d, '%s')", 1, 'access content');
+  db_query("INSERT INTO {role_permission} (rid, permission) VALUES (%d, '%s')", 1, 'view content');
 
   // Authenticated role permissions.
-  db_query("INSERT INTO {role_permission} (rid, permission) VALUES (%d, '%s')", 2, 'access comments');
-  db_query("INSERT INTO {role_permission} (rid, permission) VALUES (%d, '%s')", 2, 'access content');
+  db_query("INSERT INTO {role_permission} (rid, permission) VALUES (%d, '%s')", 2, 'view comments');
+  db_query("INSERT INTO {role_permission} (rid, permission) VALUES (%d, '%s')", 2, 'view content');
   db_query("INSERT INTO {role_permission} (rid, permission) VALUES (%d, '%s')", 2, 'post comments');
   db_query("INSERT INTO {role_permission} (rid, permission) VALUES (%d, '%s')", 2, 'post comments without approval');
 
Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.676
diff -u -p -r1.676 system.module
--- modules/system/system.module	25 Mar 2009 18:40:50 -0000	1.676
+++ modules/system/system.module	31 Mar 2009 06:07:03 -0000
@@ -193,8 +193,8 @@ function system_perm() {
       'title' => t('Access administration pages'),
       'description' => t('View the administration panel and browse the help system.'),
     ),
-    'access site reports' => array(
-      'title' => t('Access site reports'),
+    'view site reports' => array(
+      'title' => t('View site reports'),
       'description' => t('View reports from system logs and other status information.'),
     ),
     'select different theme' => array(
@@ -718,7 +718,7 @@ function system_menu() {
     'title' => 'Reports',
     'description' => 'View reports from system logs and other status information.',
     'page callback' => 'system_admin_menu_block_page',
-    'access arguments' => array('access site reports'),
+    'access arguments' => array('view site reports'),
     'weight' => 5,
     'position' => 'left',
   );
Index: modules/system/system.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.test,v
retrieving revision 1.40
diff -u -p -r1.40 system.test
--- modules/system/system.test	31 Mar 2009 01:49:54 -0000	1.40
+++ modules/system/system.test	31 Mar 2009 06:07:03 -0000
@@ -353,7 +353,7 @@ class AdminOverviewTestCase extends Drup
     $permissions[] = 'administer blocks'; // Site building, Block.
     $permissions[] = 'administer filters'; // Site configuration, Filter.
     $permissions[] = 'administer users'; // User management, User.
-    $permissions[] = 'access site reports'; // Reports, Database logging.
+    $permissions[] = 'view site reports'; // Reports, Database logging.
     $admin_user2 = $this->drupalCreateUser($permissions);
     $this->drupalLogin($admin_user2);
 
@@ -601,7 +601,7 @@ class PageTitleFiltering extends DrupalW
   function setUp() {
     parent::setUp();
 
-    $this->content_user = $this->drupalCreateUser(array('create page content', 'access content'));
+    $this->content_user = $this->drupalCreateUser(array('create page content', 'view content'));
     $this->drupalLogin($this->content_user);
     $this->saved_title = drupal_get_title();
   }
@@ -661,7 +661,7 @@ class FrontPageTestCase extends DrupalWe
     parent::setUp('system_test');
 
     // Create admin user, log in admin user, and create one node.
-    $this->admin_user = $this->drupalCreateUser(array('access content', 'administer site configuration'));
+    $this->admin_user = $this->drupalCreateUser(array('view content', 'administer site configuration'));
     $this->drupalLogin($this->admin_user);
     $this->node_path = "node/" . $this->drupalCreateNode(array('promote' => 1))->nid;
 
Index: modules/taxonomy/taxonomy.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.module,v
retrieving revision 1.464
diff -u -p -r1.464 taxonomy.module
--- modules/taxonomy/taxonomy.module	30 Mar 2009 05:18:49 -0000	1.464
+++ modules/taxonomy/taxonomy.module	31 Mar 2009 06:07:03 -0000
@@ -125,7 +125,7 @@ function taxonomy_menu() {
     'title' => 'Taxonomy term',
     'page callback' => 'taxonomy_term_page',
     'page arguments' => array(2),
-    'access arguments' => array('access content'),
+    'access arguments' => array('view content'),
     'type' => MENU_CALLBACK,
   );
 
@@ -146,7 +146,7 @@ function taxonomy_menu() {
   $items['taxonomy/autocomplete'] = array(
     'title' => 'Autocomplete taxonomy',
     'page callback' => 'taxonomy_autocomplete',
-    'access arguments' => array('access content'),
+    'access arguments' => array('view content'),
     'type' => MENU_CALLBACK,
   );
 
Index: modules/tracker/tracker.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/tracker/tracker.module,v
retrieving revision 1.157
diff -u -p -r1.157 tracker.module
--- modules/tracker/tracker.module	6 May 2008 12:18:51 -0000	1.157
+++ modules/tracker/tracker.module	31 Mar 2009 06:07:03 -0000
@@ -26,7 +26,7 @@ function tracker_menu() {
   $items['tracker'] = array(
     'title' => 'Recent posts',
     'page callback' => 'tracker_page',
-    'access arguments' => array('access content'),
+    'access arguments' => array('view content'),
     'weight' => 1,
   );
   $items['tracker/all'] = array(
@@ -61,13 +61,13 @@ function tracker_menu() {
  */
 function _tracker_myrecent_access($account) {
   // This path is only allowed for authenticated users looking at their own posts.
-  return $account->uid && ($GLOBALS['user']->uid == $account->uid) && user_access('access content');
+  return $account->uid && ($GLOBALS['user']->uid == $account->uid) && user_access('view content');
 }
 
 /**
  * Access callback for user/%user/track
  */
 function _tracker_user_access($account) {
-  return user_view_access($account) && user_access('access content');
+  return user_view_access($account) && user_access('view content');
 }
 
Index: modules/tracker/tracker.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/tracker/tracker.test,v
retrieving revision 1.7
diff -u -p -r1.7 tracker.test
--- modules/tracker/tracker.test	31 Mar 2009 01:49:54 -0000	1.7
+++ modules/tracker/tracker.test	31 Mar 2009 06:07:03 -0000
@@ -17,7 +17,7 @@ class TrackerTest extends DrupalWebTestC
   function setUp() {
     parent::setUp('comment', 'tracker');
 
-    $permissions = array('access comments', 'post comments', 'post comments without approval');
+    $permissions = array('view comments', 'post comments', 'post comments without approval');
     $this->user = $this->drupalCreateUser($permissions);
     $this->other_user = $this->drupalCreateUser($permissions);
   }
Index: modules/trigger/trigger.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/trigger/trigger.test,v
retrieving revision 1.7
diff -u -p -r1.7 trigger.test
--- modules/trigger/trigger.test	31 Mar 2009 01:49:54 -0000	1.7
+++ modules/trigger/trigger.test	31 Mar 2009 06:07:03 -0000
@@ -34,7 +34,7 @@ class TriggerContentTestCase extends Dru
       $edit = array('aid' => $hash);
       $this->drupalPost('admin/build/trigger/node', $edit, t('Assign'));
       // Create an unpublished node.
-      $web_user = $this->drupalCreateUser(array('create page content', 'access content', 'administer nodes'));
+      $web_user = $this->drupalCreateUser(array('create page content', 'view content', 'administer nodes'));
       $this->drupalLogin($web_user);
       $edit = array();
       $edit['title']    = '!SimpleTest test node! ' . $this->randomName(10);
Index: modules/upload/upload.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/upload/upload.test,v
retrieving revision 1.14
diff -u -p -r1.14 upload.test
--- modules/upload/upload.test	31 Mar 2009 01:49:55 -0000	1.14
+++ modules/upload/upload.test	31 Mar 2009 06:07:03 -0000
@@ -20,7 +20,7 @@ class UploadTestCase extends DrupalWebTe
   function testNodeUpload() {
     global $base_url;
     $admin_user = $this->drupalCreateUser(array('administer site configuration'));
-    $web_user = $this->drupalCreateUser(array('access content', 'edit any page content', 'upload files', 'view uploaded files'));
+    $web_user = $this->drupalCreateUser(array('view content', 'edit any page content', 'upload files', 'view uploaded files'));
 
     $this->drupalLogin($admin_user);
 
@@ -88,7 +88,7 @@ class UploadTestCase extends DrupalWebTe
    */
   function testFilesFilter() {
     $admin_user = $this->drupalCreateUser(array('administer site configuration'));
-    $web_user = $this->drupalCreateUser(array('access content', 'edit any page content', 'upload files', 'view uploaded files'));
+    $web_user = $this->drupalCreateUser(array('view content', 'edit any page content', 'upload files', 'view uploaded files'));
 
     $this->drupalLogin($admin_user);
 
@@ -131,7 +131,7 @@ class UploadTestCase extends DrupalWebTe
     $file = current($files)->filepath;
 
     $admin_user = $this->drupalCreateUser(array('administer site configuration'));
-    $web_user = $this->drupalCreateUser(array('access content', 'edit any page content', 'upload files', 'view uploaded files'));
+    $web_user = $this->drupalCreateUser(array('view content', 'edit any page content', 'upload files', 'view uploaded files'));
 
     $this->drupalLogin($admin_user);
 
Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.972
diff -u -p -r1.972 user.module
--- modules/user/user.module	26 Mar 2009 13:31:28 -0000	1.972
+++ modules/user/user.module	31 Mar 2009 06:07:04 -0000
@@ -777,8 +777,8 @@ function user_perm() {
        'title' => t('Administer users'),
        'description' => t('Manage or block users, and manage their role assignments.'),
      ),
-     'access user profiles' => array(
-       'title' => t('Access user profiles'),
+     'view user profiles' => array(
+       'title' => t('View user profiles'),
        'description' => t('View profiles of users on the site, which may contain personal information.'),
      ),
      'change own username' => array(
@@ -837,11 +837,11 @@ function user_file_delete($file) {
 function user_search($op = 'search', $keys = NULL, $skip_access_check = FALSE) {
   switch ($op) {
     case 'name':
-      if ($skip_access_check || user_access('access user profiles')) {
+      if ($skip_access_check || user_access('view user profiles')) {
         return t('Users');
       }
     case 'search':
-      if (user_access('access user profiles')) {
+      if (user_access('view user profiles')) {
         $find = array();
         // Replace wildcards with MySQL/PostgreSQL wildcards.
         $keys = preg_replace('!\*+!', '%', $keys);
@@ -1083,7 +1083,7 @@ function user_block_view($delta = '') {
       return $block;
 
     case 'new':
-      if (user_access('access content')) {
+      if (user_access('view content')) {
         // Retrieve a list of new users who have subsequently accessed the site successfully.
         $items = db_query_range('SELECT uid, name FROM {users} WHERE status != 0 AND access != 0 ORDER BY created DESC', array(), 0, variable_get('user_block_whois_new_count', 5))->fetchAll();
         $output = theme('user_list', $items);
@@ -1094,7 +1094,7 @@ function user_block_view($delta = '') {
       return $block;
 
     case 'online':
-      if (user_access('access content')) {
+      if (user_access('view content')) {
         // Count users active within the defined period.
         $interval = REQUEST_TIME - variable_get('user_block_seconds_online', 900);
 
@@ -1166,7 +1166,7 @@ function template_preprocess_user_pictur
     if (isset($filepath)) {
       $alt = t("@user's picture", array('@user' => $account->name ? $account->name : variable_get('anonymous', t('Anonymous'))));
       $variables['picture'] = theme('image', $filepath, $alt, $alt, '', FALSE);
-      if (!empty($account->uid) && user_access('access user profiles')) {
+      if (!empty($account->uid) && user_access('view user profiles')) {
         $attributes = array('attributes' => array('title' => t('View user profile.')), 'html' => TRUE);
         $variables['picture'] = l($variables['picture'], "user/$account->uid", $attributes);
       }
@@ -1214,7 +1214,7 @@ function user_view_access($account) {
       // Administrators can view all accounts.
       user_access('administer users') ||
       // The user is not blocked and logged in at least once.
-      ($account->access && $account->status && user_access('access user profiles'))
+      ($account->access && $account->status && user_access('view user profiles'))
     );
 }
 
@@ -1248,7 +1248,7 @@ function user_menu() {
     'title' => 'User autocomplete',
     'page callback' => 'user_autocomplete',
     'access callback' => 'user_access',
-    'access arguments' => array('access user profiles'),
+    'access arguments' => array('view user profiles'),
     'type' => MENU_CALLBACK,
   );
 
Index: modules/user/user.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.test,v
retrieving revision 1.33
diff -u -p -r1.33 user.test
--- modules/user/user.test	31 Mar 2009 01:49:55 -0000	1.33
+++ modules/user/user.test	31 Mar 2009 06:07:04 -0000
@@ -725,7 +725,7 @@ class UserPermissionsTestCase extends Dr
   function setUp() {
     parent::setUp();
 
-    $this->admin_user = $this->drupalCreateUser(array('administer permissions', 'access user profiles'));
+    $this->admin_user = $this->drupalCreateUser(array('administer permissions', 'view user profiles'));
 
     // Find the new role ID - it must be the maximum.
     $all_rids = array_keys($this->admin_user->roles);
@@ -750,12 +750,12 @@ class UserPermissionsTestCase extends Dr
     $this->assertTrue(user_access('administer nodes', $account, TRUE), t('User now has "administer nodes" permission.'));
 
     // Remove a permission.
-    $this->assertTrue(user_access('access user profiles', $account, TRUE), t('User has "access user profiles" permission.'));
+    $this->assertTrue(user_access('view user profiles', $account, TRUE), t('User has "view user profiles" permission.'));
     $edit = array();
-    $edit[$rid . '[access user profiles]'] = FALSE;
+    $edit[$rid . '[view user profiles]'] = FALSE;
     $this->drupalPost('admin/user/permissions', $edit, t('Save permissions'));
     $this->assertText(t('The changes have been saved.'), t('Successful save message displayed.'));
-    $this->assertFalse(user_access('access user profiles', $account, TRUE), t('User no longer has "access user profiles" permission.'));
+    $this->assertFalse(user_access('view user profiles', $account, TRUE), t('User no longer has "view user profiles" permission.'));
   }
 
 }
@@ -887,7 +887,7 @@ class UserAutocompleteTestCase extends D
 
     // Set up two users with different permissions to test access.
     $this->unprivileged_user = $this->drupalCreateUser();
-    $this->privileged_user = $this->drupalCreateUser(array('access user profiles'));
+    $this->privileged_user = $this->drupalCreateUser(array('view user profiles'));
   }
 
   /**