? cvs-release-notes.php
Index: privatemsg.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/privatemsg/privatemsg.module,v
retrieving revision 1.70.2.30.2.91.2.64.2.96
diff -u -p -r1.70.2.30.2.91.2.64.2.96 privatemsg.module
--- privatemsg.module	10 Dec 2010 09:53:15 -0000	1.70.2.30.2.91.2.64.2.96
+++ privatemsg.module	23 Dec 2010 07:41:46 -0000
@@ -1166,11 +1166,15 @@ function privatemsg_sql_deleted($days, $
 function privatemsg_user_view($account) {
   if (($url = privatemsg_get_link(array($account))) && variable_get('privatemsg_display_profile_links', 1)) {
     $account->content['privatemsg_send_new_message'] = array(
-      '#type'   => 'user_profile_item',
-      '#title'  => t('Private messages'),
-      '#markup'  => l(t('Send this user a message'), $url, array('query' => drupal_get_destination(), 'title' => t('Send this user a message'), 'attributes' => array('class' => 'privatemsg-send-link privatemsg-send-link-profile'))),
+      '#type'   => 'link',
+      '#title'  => t('Send this user a private message'),
+      '#href'  => $url,
       '#weight' => 10,
-      '#attributes' => array('class' => array('privatemsg-profile-link')),
+      '#options' => array(
+        'query' => drupal_get_destination(),
+        'title' => t('Send this user a private message'),
+        'attributes' => array('class' => 'privatemsg-send-link privatemsg-send-link-profile'),
+      ),
     );
   }
 }
@@ -2019,6 +2023,13 @@ function _privatemsg_list_headers($keys)
       $header[$key] = $return;
     }
   }
+  uasort($header, 'element_sort');
+  // Remove weight column or it will show up in the markup.
+  foreach ($header as $key => $element) {
+    if (isset($header[$key]['#weight'])) {
+      unset($header[$key]['#weight']);
+    }
+  }
   return $header;
 }
 
Index: privatemsg.pages.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/privatemsg/privatemsg.pages.inc,v
retrieving revision 1.1.2.35
diff -u -p -r1.1.2.35 privatemsg.pages.inc
--- privatemsg.pages.inc	10 Dec 2010 09:53:15 -0000	1.1.2.35
+++ privatemsg.pages.inc	23 Dec 2010 07:41:46 -0000
@@ -163,7 +163,6 @@ function privatemsg_list($form, &$form_s
 
   // Load the themed list headers based on the available data.
   $headers = _privatemsg_list_headers($columns);
-  uasort($headers, 'element_sort');
 
   $form = array(
     '#list_argument' => $argument,
Index: pm_block_user/pm_block_user.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/privatemsg/pm_block_user/pm_block_user.test,v
retrieving revision 1.1.2.12
diff -u -p -r1.1.2.12 pm_block_user.test
--- pm_block_user/pm_block_user.test	7 Oct 2010 00:25:14 -0000	1.1.2.12
+++ pm_block_user/pm_block_user.test	23 Dec 2010 07:41:46 -0000
@@ -37,7 +37,7 @@ class PrivatemsgBlockUserCase extends Dr
     // Visit profile page of user 2 and verify that there is a link to write a
     // message.
     $this->drupalGet('user/' . $user2->uid);
-    $this->assertText(t('Send this user a message'));
+    $this->assertText(t('Send this user a private message'));
 
     $this->drupalGet('messages');
     $this->clickLink($subject);
@@ -96,7 +96,7 @@ class PrivatemsgBlockUserCase extends Dr
 
     // Access profile to see if there is a write message link.
     $this->drupalGet('user/' . $user1->uid);
-    $this->assertNoText(t('Send this user a message'));
+    $this->assertNoText(t('Send this user a private message'));
 
     $edit = array(
       'recipient' => $user1->name,
@@ -115,8 +115,8 @@ class PrivatemsgBlockUserCase extends Dr
     $this->drupalPost('messages/new', $edit, t('Send message'));
     $this->assertRaw(t('%user has chosen to block messages from you.', array('%user' => $user1->name)), t('User 1 blocks user 2 message displayed'));
     $this->assertText(t('A message has been sent to @user.', array('@user' => $user3->name)), t('Message sent to user 3'));
-  
-    
+
+
     // Try to reply to an existing thread.
     $this->drupalGet('messages');
     $this->clickLink($subject);
@@ -125,7 +125,7 @@ class PrivatemsgBlockUserCase extends Dr
     $this->drupalPost(NULL, $edit, t('Send message'));
     $this->assertText(t('@user has chosen to block messages from you.', array('@user' => $user1->name)));
     $this->assertText(t('A message has been sent to @user.', array('@user' => $user3->name)), t('Message sent to user 3'));
-  
+
     // Login as user1 again and check that we didn't recieve the messages.
     $this->drupalLogin($user1);
     $this->drupalGet('messages');
Index: privatemsg_filter/privatemsg_filter.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/privatemsg/privatemsg_filter/privatemsg_filter.module,v
retrieving revision 1.1.2.17.2.33
diff -u -p -r1.1.2.17.2.33 privatemsg_filter.module
--- privatemsg_filter/privatemsg_filter.module	10 Dec 2010 09:53:15 -0000	1.1.2.17.2.33
+++ privatemsg_filter/privatemsg_filter.module	23 Dec 2010 07:41:46 -0000
@@ -605,7 +605,6 @@ function theme_privatemsg_list_header__t
   if (privatemsg_user_access('tag private messages')) {
     return array(
       'data' => t('Tags'),
-      'key' => 'tags',
       'class' => 'privatemsg-header-tags',
       '#weight' => -42,
     );