? .git
? fix_tagging_with_prefix.patch
? privatemsg.views_.patch
? privatemsg_attachments
? privatemsg_roles
? privatemsg_rules
? privatemsg_textfield.patch
Index: privatemsg.test
===================================================================
RCS file: /cvs/drupal/contributions/modules/privatemsg/privatemsg.test,v
retrieving revision 1.27
diff -u -p -r1.27 privatemsg.test
--- privatemsg.test	19 Nov 2010 00:54:47 -0000	1.27
+++ privatemsg.test	27 Nov 2010 16:27:50 -0000
@@ -929,12 +929,16 @@ class PrivatemsgURLPrefixTestCase extend
    */
   function checkPrefix($url_prefix) {
     $author    = $this->drupalCreateUser(array('write privatemsg', 'read privatemsg'));
-    $recipient = $this->drupalCreateUser(array('write privatemsg', 'read privatemsg'));
+    $recipient = $this->drupalCreateUser(array('write privatemsg', 'read privatemsg', 'tag private messages', 'create private message tags'));
     $admin     = $this->drupalCreateUser(array('write privatemsg', 'read privatemsg', 'read all private messages', 'administer privatemsg settings', 'administer blocks'));
 
     // Login as admin, set prefix, and set blocks.
     $this->drupalLogin($admin);
-    $this->drupalPost('admin/settings/messages', array('privatemsg_url_prefix' => $url_prefix), t('Save configuration'));
+    $settings = array(
+      'privatemsg_url_prefix' => $url_prefix,
+      'privatemsg_display_fields[tags]' => 'tags',
+    );
+    $this->drupalPost('admin/settings/messages', $settings, t('Save configuration'));
     $this->assertText(t('The configuration options have been saved.'));
 
     // Check that 'Messages' link does not show up in main nav if using %user token. Do this before enabling blocks.
@@ -1000,6 +1004,17 @@ class PrivatemsgURLPrefixTestCase extend
     $this->clickLink($edit['subject']);
     $this->assertText($edit['body'], t('Message body found on message view.'));
 
+    // Tag a message to verify that the tag shows up.
+    $tagging = array(
+      'tags' => $this->randomName(5),
+    );
+    $this->drupalPost(NULL, $tagging, t('Tag this conversation'));
+
+    $this->drupalGet(privatemsg_get_dynamic_url_prefix($recipient->uid) . '/inbox');
+    $this->assertText($tagging['tags'], t('Tag found in inbox.'));
+    
+    $this->clickLink($edit['subject']);
+
     // Check that blocked users path works as expected.
     $this->clickLink('Block');
     $this->drupalPost(NULL, NULL, t('Block @user', array('@user' => $author->name)));
Index: privatemsg_filter/privatemsg_filter.module
===================================================================
RCS file: /cvs/drupal/contributions/modules/privatemsg/privatemsg_filter/privatemsg_filter.module,v
retrieving revision 1.16
diff -u -p -r1.16 privatemsg_filter.module
--- privatemsg_filter/privatemsg_filter.module	21 Nov 2010 14:49:01 -0000	1.16
+++ privatemsg_filter/privatemsg_filter.module	27 Nov 2010 16:27:53 -0000
@@ -689,7 +689,7 @@ function privatemsg_filter_privatemsg_sq
  */
 function privatemsg_filter_privatemsg_view_messages_alter(&$content, $thread) {
   if (count($thread['messages']) > 0) {
-    $content['tags']['#value'] = drupal_get_form('privatemsg_filter_form');
+    $content['tags']['#value'] = drupal_get_form('privatemsg_filter_form', $thread['thread_id']);
     $content['tags']['#weight'] = variable_get('privatemsg_filter_tagfield_weight', 10);
   }
 }
@@ -697,9 +697,8 @@ function privatemsg_filter_privatemsg_vi
 /**
  * Form to show and allow modification of tagging information of a conversation.
  */
-function privatemsg_filter_form(&$form_state) {
+function privatemsg_filter_form(&$form_state, $thread_id) {
   global $user;
-  $thread_id = arg(2);
 
   // Get a list of current tags for this thread
   $query = _privatemsg_assemble_query(array('tags', 'privatemsg_filter'), $user, array($thread_id));