? .DS_Store
? includes/.DS_Store
? includes/database/.DS_Store
? modules/search/.new.MKbmKA
? sites/all/.DS_Store
? sites/all/modules/.DS_Store
? sites/all/modules/admin_menu
? sites/all/modules/content_browser
? sites/all/modules/devel
? sites/all/modules/views
? sites/all/themes/zen
? sites/default/files
? sites/default/private
? sites/default/settings.php
Index: includes/theme.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.inc,v
retrieving revision 1.564
diff -u -p -r1.564 theme.inc
--- includes/theme.inc	7 Jan 2010 14:48:56 -0000	1.564
+++ includes/theme.inc	7 Jan 2010 18:43:36 -0000
@@ -2079,7 +2079,7 @@ function template_preprocess_username(&$
   }
   $variables['name'] = check_plain($name);
 
-  $variables['profile_access'] = user_access('access user profiles');
+  $variables['profile_access'] = user_access('access user accounts');
   $variables['link_attributes'] = array();
   // Populate link path and attributes if appropriate.
   if ($variables['uid'] && $variables['profile_access']) {
Index: modules/comment/comment.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.test,v
retrieving revision 1.62
diff -u -p -r1.62 comment.test
--- modules/comment/comment.test	7 Jan 2010 05:23:51 -0000	1.62
+++ modules/comment/comment.test	7 Jan 2010 18:43:38 -0000
@@ -1070,7 +1070,7 @@ class CommentRdfaTestCase extends Commen
     parent::setUp('comment', 'rdf');
 
     $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', 'access user profiles'));
+    $this->web_user = $this->drupalCreateUser(array('access comments', 'post comments', 'create article content', 'access user accounts'));
 
     // Enables anonymous user comments.
     user_role_change_permissions(DRUPAL_ANONYMOUS_RID, array(
Index: modules/contact/contact.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/contact/contact.pages.inc,v
retrieving revision 1.39
diff -u -p -r1.39 contact.pages.inc
--- modules/contact/contact.pages.inc	3 Jan 2010 21:01:04 -0000	1.39
+++ modules/contact/contact.pages.inc	7 Jan 2010 18:43:38 -0000
@@ -285,5 +285,5 @@ function contact_personal_form_submit($f
 
   // Jump to the contacted user's profile page.
   drupal_set_message(t('Your message has been sent.'));
-  $form_state['redirect'] = user_access('access user profiles') ? 'user/' . $values['recipient']->uid : '';
+  $form_state['redirect'] = user_access('access user accounts') ? 'user/' . $values['recipient']->uid : '';
 }
Index: modules/file/file.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/file/file.module,v
retrieving revision 1.16
diff -u -p -r1.16 file.module
--- modules/file/file.module	3 Jan 2010 22:01:46 -0000	1.16
+++ modules/file/file.module	7 Jan 2010 18:43:38 -0000
@@ -155,7 +155,7 @@ function file_file_download($uri, $field
           }
         }
         if ($obj_type == 'user') {
-          if (user_access('access user profiles') || $user->uid == $reference->uid) {
+          if (user_access('access user accounts') || $user->uid == $reference->uid) {
             $denied = FALSE;
             break 3;
           }
Index: modules/node/node.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.test,v
retrieving revision 1.61
diff -u -p -r1.61 node.test
--- modules/node/node.test	29 Dec 2009 19:14:27 -0000	1.61
+++ modules/node/node.test	7 Jan 2010 18:43:42 -0000
@@ -550,7 +550,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', 'access user accounts'));
     $this->drupalLogin($web_user);
   }
 
Index: modules/profile/profile.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/profile/profile.module,v
retrieving revision 1.284
diff -u -p -r1.284 profile.module
--- modules/profile/profile.module	14 Dec 2009 20:38:15 -0000	1.284
+++ modules/profile/profile.module	7 Jan 2010 18:43:42 -0000
@@ -81,7 +81,7 @@ function profile_menu() {
   $items['profile'] = array(
     'title' => 'User list',
     'page callback' => 'profile_browse',
-    'access arguments' => array('access user profiles'),
+    'access arguments' => array('access user accounts'),
     'file' => 'profile.pages.inc',
     'type' => MENU_SUGGESTED_ITEM,
   );
@@ -127,7 +127,7 @@ function profile_menu() {
   $items['profile/autocomplete'] = array(
     'title' => 'Profile autocomplete',
     'page callback' => 'profile_autocomplete',
-    'access arguments' => array('access user profiles'),
+    'access arguments' => array('access user accounts'),
     'file' => 'profile.pages.inc',
     'type' => MENU_CALLBACK,
   );
@@ -175,7 +175,7 @@ function profile_block_save($delta = '',
  * Implements hook_block_view().
  */
 function profile_block_view($delta = '') {
-  if (user_access('access user profiles')) {
+  if (user_access('access user accounts')) {
     $output = '';
     if ((arg(0) == 'node') && is_numeric(arg(1)) && (arg(2) == NULL)) {
       $node = node_load(arg(1));
@@ -275,7 +275,7 @@ function profile_view_field($account, $f
   // 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('access user accounts')
         && (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.23
diff -u -p -r1.23 profile.test
--- modules/profile/profile.test	20 Nov 2009 04:15:15 -0000	1.23
+++ modules/profile/profile.test	7 Jan 2010 18:43:43 -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', 'access user accounts'));
 
     // This is the user whose profile will be edited.
     $this->normal_user = $this->drupalCreateUser();
@@ -350,7 +350,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 'access user accounts' permission.
     $this->drupalLogout();
     $this->drupalLogin($this->normal_user);
 
Index: modules/system/system.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.test,v
retrieving revision 1.100
diff -u -p -r1.100 system.test
--- modules/system/system.test	4 Jan 2010 21:31:52 -0000	1.100
+++ modules/system/system.test	7 Jan 2010 18:43:48 -0000
@@ -1072,7 +1072,7 @@ class SystemMainContentFallback extends 
     $this->drupalLogin($this->admin_user);
 
     // Create a web user.
-    $this->web_user = $this->drupalCreateUser(array('access user profiles', 'access content'));
+    $this->web_user = $this->drupalCreateUser(array('access user accounts', 'access content'));
   }
 
   /**
Index: modules/tracker/tracker.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/tracker/tracker.test,v
retrieving revision 1.17
diff -u -p -r1.17 tracker.test
--- modules/tracker/tracker.test	7 Jan 2010 05:23:51 -0000	1.17
+++ modules/tracker/tracker.test	7 Jan 2010 18:43:49 -0000
@@ -85,7 +85,7 @@ class TrackerTest extends DrupalWebTestC
     $this->assertText($other_published_my_comment->title[LANGUAGE_NONE][0]['value'], t("Nodes that the user has commented on appear in the user's tracker listing."));
 
     // Verify that unpublished comments are removed from the tracker.
-    $admin_user = $this->drupalCreateUser(array('administer comments', 'access user profiles'));
+    $admin_user = $this->drupalCreateUser(array('administer comments', 'access user accounts'));
     $this->drupalLogin($admin_user);
     $this->drupalPost('comment/1/edit', array('status' => COMMENT_NOT_PUBLISHED), t('Save'));
     $this->drupalGet('user/' . $this->user->uid . '/track');
Index: modules/user/user.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.install,v
retrieving revision 1.34
diff -u -p -r1.34 user.install
--- modules/user/user.install	20 Dec 2009 20:07:59 -0000	1.34
+++ modules/user/user.install	7 Jan 2010 18:43:50 -0000
@@ -487,6 +487,16 @@ function user_update_7005(&$sandbox) {
 }
 
 /**
+ * Rename 'access user profiles' permission to 'access user accounts'
+ */
+function user_update_7006(&$sandbox) {
+  db_update('role_permission')
+    ->fields(array('permission' => 'access user accounts'))
+    ->condition('permission', 'access user profiles')
+    ->execute();
+}
+
+/**
  * @} End of "defgroup user-updates-6.x-to-7.x"
  * The next series of updates should start at 8000.
  */
Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.1099
diff -u -p -r1.1099 user.module
--- modules/user/user.module	7 Jan 2010 04:54:18 -0000	1.1099
+++ modules/user/user.module	7 Jan 2010 18:43:53 -0000
@@ -761,8 +761,8 @@ function user_permission() {
       'title' => t('Administer users'),
       'description' => drupal_placeholder(array('text' => t('Warning: Give to trusted roles only; this permission has security implications.'))),
     ),
-    'access user profiles' => array(
-      'title' => t('View user profiles'),
+    'access user accounts' => array(
+      'title' => t('View user accounts'),
     ),
     'change own username' => array(
       'title' => t('Change own username'),
@@ -826,7 +826,7 @@ function user_search_info() {
  * Implements hook_search_access().
  */
 function user_search_access() {
-  return user_access('access user profiles');
+  return user_access('access user accounts');
 }
 
 /**
@@ -1293,7 +1293,7 @@ function template_preprocess_user_pictur
       else {
         $variables['user_picture'] = theme('image', array('path' => $filepath, 'alt' => $alt, 'title' => $alt, 'attributes' => array(), 'getsize' => FALSE));
       }
-      if (!empty($account->uid) && user_access('access user profiles')) {
+      if (!empty($account->uid) && user_access('access user accounts')) {
         $attributes = array('attributes' => array('title' => t('View user profile.')), 'html' => TRUE);
         $variables['user_picture'] = l($variables['user_picture'], "user/$account->uid", $attributes);
       }
@@ -1345,7 +1345,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('access user accounts'))
     );
 }
 
@@ -1379,7 +1379,7 @@ function user_menu() {
     'title' => 'User autocomplete',
     'page callback' => 'user_autocomplete',
     'access callback' => 'user_access',
-    'access arguments' => array('access user profiles'),
+    'access arguments' => array('access user accounts'),
     'type' => MENU_CALLBACK,
     'file' => 'user.pages.inc',
   );
@@ -2487,7 +2487,7 @@ function user_role_delete($role) {
  *   @code
  *     array(
  *       'administer nodes' => 0,
- *       'access user profiles' => 1,
+ *       'access user accounts' => 1,
  *     )
  *   @endcode
  *   Existing permissions are not changed, unless specified in $permissions.
Index: modules/user/user.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.test,v
retrieving revision 1.74
diff -u -p -r1.74 user.test
--- modules/user/user.test	7 Jan 2010 05:23:52 -0000	1.74
+++ modules/user/user.test	7 Jan 2010 18:43:54 -0000
@@ -894,7 +894,7 @@ class UserPermissionsTestCase extends Dr
   function setUp() {
     parent::setUp();
 
-    $this->admin_user = $this->drupalCreateUser(array('administer permissions', 'access user profiles', 'administer site configuration', 'administer modules', 'administer users'));
+    $this->admin_user = $this->drupalCreateUser(array('administer permissions', 'access user accounts', 'administer site configuration', 'administer modules', 'administer users'));
 
     // Find the new role ID - it must be the maximum.
     $all_rids = array_keys($this->admin_user->roles);
@@ -921,14 +921,14 @@ class UserPermissionsTestCase extends Dr
     $this->assertTrue(user_access('administer nodes', $account), t('User now has "administer nodes" permission.'));
 
     // Remove a permission.
-    $this->assertTrue(user_access('access user profiles', $account), t('User has "access user profiles" permission.'));
+    $this->assertTrue(user_access('access user accounts', $account), t('User has "access user accounts" permission.'));
     $edit = array();
-    $edit[$rid . '[access user profiles]'] = FALSE;
+    $edit[$rid . '[access user accounts]'] = FALSE;
     $this->drupalPost('admin/config/people/permissions', $edit, t('Save permissions'));
     $this->assertText(t('The changes have been saved.'), t('Successful save message displayed.'));
     drupal_static_reset('user_access');
     drupal_static_reset('user_role_permissions');
-    $this->assertFalse(user_access('access user profiles', $account), t('User no longer has "access user profiles" permission.'));
+    $this->assertFalse(user_access('access user accounts', $account), t('User no longer has "access user accounts" permission.'));
   }
 
   /**
@@ -960,19 +960,19 @@ class UserPermissionsTestCase extends Dr
 
     // Verify current permissions.
     $this->assertFalse(user_access('administer nodes', $account), t('User does not have "administer nodes" permission.'));
-    $this->assertTrue(user_access('access user profiles', $account), t('User has "access user profiles" permission.'));
+    $this->assertTrue(user_access('access user accounts', $account), t('User has "access user accounts" permission.'));
     $this->assertTrue(user_access('administer site configuration', $account), t('User has "administer site configuration" permission.'));
 
     // Change permissions.
     $permissions = array(
       'administer nodes' => 1,
-      'access user profiles' => 0,
+      'access user accounts' => 0,
     );
     user_role_change_permissions($rid, $permissions);
 
     // Verify proper permission changes.
     $this->assertTrue(user_access('administer nodes', $account), t('User now has "administer nodes" permission.'));
-    $this->assertFalse(user_access('access user profiles', $account), t('User no longer has "access user profiles" permission.'));
+    $this->assertFalse(user_access('access user accounts', $account), t('User no longer has "access user accounts" permission.'));
     $this->assertTrue(user_access('administer site configuration', $account), t('User still has "administer site configuration" permission.'));
   }
 }
@@ -1107,7 +1107,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('access user accounts'));
   }
 
   /**