Index: privatemsg.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/privatemsg/privatemsg.module,v
retrieving revision 1.101
diff -u -r1.101 privatemsg.module
--- privatemsg.module	15 Nov 2008 03:46:55 -0000	1.101
+++ privatemsg.module	15 Nov 2008 16:57:01 -0000
@@ -37,7 +37,7 @@
     'access arguments' => array('read privatemsg'),
     'type'             => MENU_NORMAL_ITEM,
   );
-  $items['messages/inbox'] = array(
+  $items['messages/list'] = array(
     'title'            => 'All messages',
     'page callback'    => 'privatemsg_list',
     'access arguments' => array('read privatemsg'),
@@ -52,13 +52,6 @@
     'type'             => MENU_NORMAL_ITEM,
     'weight'           => -9,
   );
-  $items['messages/sent'] = array(
-    'title'            => 'Sent messages',
-    'page callback'    => 'privatemsg_list',
-    'access arguments' => array('read privatemsg'),
-    'type'             => MENU_LOCAL_TASK,
-    'weight'           => -5,
-  );
   $items['messages/view/%'] = array(
     'title'            => 'Read private message',
     'page callback'    => 'privatemsg_view',
@@ -263,14 +256,8 @@
  * Display the list of messages for a given user, called by privatemsg_privatemsg_alter
  */
 function privatemsg_list_messages($account) {
-  switch (arg(1)) {
-    case 'sent':
-      $query = _privatemsg_assemble_query('privatemsg_list_sent', $account);
-      break;
-    case 'inbox':
-    default:
-      $query = _privatemsg_assemble_query('privatemsg_list', $account);
-  }
+
+  $query = _privatemsg_assemble_query('privatemsg_list', $account);
   $result = pager_query($query['query'], variable_get('privatemsg_per_page', 25), 0, $query['count']);
 
   $rows = array();
@@ -653,34 +640,6 @@
   $form_state['rebuild'] = TRUE; //this forces our form to be rebuilt instead of being submitted.
 }
 
-function privatemsg_privatemsg_list_sent_alter(&$fragments, $account) {
-  $fragments['primary_table'] = '{pm_message} pm';
-
-  $fragments['select'][]      = 'pmi.thread_id';
-  $fragments['select'][]      = 'pm.subject';
-  $fragments['select'][]      = 'MAX(pm.timestamp) as timestamp';
-  $fragments['inner_join'][]  = 'INNER JOIN {pm_index} pmi ON pm.mid = pmi.mid';
-  $fragments['where'][]       = 'pmi.uid = %d';
-  $fragments['query_args'][]  = $account->uid;
-  $fragments['where'][]       = 'pm.author = %d';
-  $fragments['query_args'][]  = $account->uid;
-  $fragments['where'][]       = 'pmi.deleted = 0';
-  $fragments['group_by'][]  = 'pmi.thread_id';
-  $order = 'timestamp';
-  $sort = 'desc';
-  if (isset($_GET['order'])) {
-    switch ($_GET['order']) {
-      case ('subject'):
-        $order = 'pm.subject';
-        break;
-      default:
-        $order = 'timestamp';
-    }
-    $sort = isset($_GET['sort']) && ($_GET['sort'] == 'asc' || $_GET['sort'] == 'desc') ? $_GET['sort'] : 'desc';
-  }
-  $fragments['order_by'][]  = $order . ' ' . $sort;
-}
-
 function privatemsg_privatemsg_list_alter(&$fragments, $account) {
   $fragments['primary_table'] = '{pm_message} pm';
 
@@ -705,7 +664,6 @@
     $sort = isset($_GET['sort']) && ($_GET['sort'] == 'asc' || $_GET['sort'] == 'desc') ? $_GET['sort'] : 'desc';
   }
   $fragments['order_by'][]  = $order . ' ' . $sort . ', timestamp DESC';
-
 }
 
 function privatemsg_privatemsg_load_alter(&$fragments, $pmid, $uid) {
@@ -826,7 +784,7 @@
     case 'login':
       $count = privatemsg_unread_count();
       if ($count) {
-        drupal_set_message(t('You have <a href="@inbox">%unread</a>.', array('@inbox' => url('messages/inbox'), '%unread' => format_plural($count, '1 unread message', '@count unread messages'))));
+        drupal_set_message(t('You have <a href="@list">%unread</a>.', array('@list' => url('messages/list'), '%unread' => format_plural($count, 'an unread message', '@count unread messages'))));
       }
       break;
   }
@@ -879,9 +837,6 @@
   if (user_access('read privatemsg') || user_access('read all private messages') ) {
     $links[] = l(t('All messages@new', array('@new' => $new)), 'messages');
   }
-  if (user_access('read privatemsg') || user_access('read all private messages') ) {
-    $links[] = l(t('Sent messages'), 'messages/sent');
-  }
   if ( count( $links ) ) {
     $block = array(
       'subject' => 'Private messages',