Index: privatemsg.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/privatemsg/privatemsg.install,v
retrieving revision 1.5.2.4.2.11.2.11.2.11
diff -u -p -r1.5.2.4.2.11.2.11.2.11 privatemsg.install
--- privatemsg.install	8 Sep 2010 23:17:31 -0000	1.5.2.4.2.11.2.11.2.11
+++ privatemsg.install	21 Oct 2010 08:50:43 -0000
@@ -89,10 +89,9 @@ function privatemsg_schema() {
         'size'          => 'big',
       ),
       'format'        => array(
-        'type'          => 'int',
-        'size'          => 'small',
-        'not null'      => TRUE,
-        'default'       => 0,
+        'type'          => 'varchar',
+        'length'        => 255,
+        'not null'      => FALSE,
         'description'   => 'The {filter_formats}.format of the message text.',
       ),
       'timestamp'     => array(
@@ -162,4 +161,16 @@ function privatemsg_update_7000() {
     'unsigned'      => TRUE,
     'default'       => 0,
   ));
-}
\ No newline at end of file
+}
+
+/**
+ * Update format column to varchar.
+ */
+function privatemsg_update_7001() {
+  db_change_field('pm_message', 'format', 'format', array(
+    'type'          => 'varchar',
+    'length'        => 255,
+    'not null'      => FALSE,
+    'description'   => 'The {filter_formats}.format of the message text.',
+  ));
+}
Index: privatemsg.pages.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/privatemsg/privatemsg.pages.inc,v
retrieving revision 1.1.2.31
diff -u -p -r1.1.2.31 privatemsg.pages.inc
--- privatemsg.pages.inc	13 Oct 2010 15:31:12 -0000	1.1.2.31
+++ privatemsg.pages.inc	21 Oct 2010 08:51:05 -0000
@@ -574,7 +574,7 @@ function privatemsg_new_submit($form, &$
     if (error_displayable()) {
       require_once DRUPAL_ROOT . '/includes/errors.inc';
       $variables = _drupal_decode_exception($e);
-      drupal_set_message(t('Failed to send a message to !recipients. %type: %message in %function (line %line of %file).', array('!recipients' => implode(', ', $recipient_names)) + $variables), 'error');
+      drupal_set_message(t('Failed to send a message to !recipients. %type: !message in %function (line %line of %file).', array('!recipients' => implode(', ', $recipient_names)) + $variables), 'error');
     }
     else {
       drupal_set_message(t('Failed to send a message to !recipients. Contact your site administrator.', array('!recipients' => implode(', ', $recipient_names))), 'error');
Index: privatemsg.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/privatemsg/privatemsg.test,v
retrieving revision 1.2.2.1.2.39
diff -u -p -r1.2.2.1.2.39 privatemsg.test
--- privatemsg.test	7 Oct 2010 00:25:14 -0000	1.2.2.1.2.39
+++ privatemsg.test	21 Oct 2010 08:51:19 -0000
@@ -37,7 +37,7 @@ class PrivatemsgTestCase extends DrupalW
    * Create user with no 'read privatemsg' permission. Try to access mailbox and see if it gives access denied error
    * Create user with 'read privatemsg' permission. Try to access mailbox and see if it gives allows access
    */
-  function dtestPrivatemsgReadPrivatemsgPermission() {
+  function testPrivatemsgReadPrivatemsgPermission() {
     $user_no_read_msg = $this->drupalCreateUser(); // set up user with default permissions (meaning: no read privatemsg permission
     $author     = $this->drupalCreateUser(array('write privatemsg', 'read privatemsg'));
     $recipient  = $this->drupalCreateUser(array('read privatemsg'));
@@ -73,7 +73,7 @@ class PrivatemsgTestCase extends DrupalW
    * Create user with no 'write privatemsg' permission. Try to access Write New Message page and see if it gives access denied error
    * Create user with 'write privatemsg' permission. Try to access Write New Message page and see if it gives allows access
    */
-  function dtestPrivatemsgWritePrivatemsgPermission() {
+  function testPrivatemsgWritePrivatemsgPermission() {
     $user_no_write_msg = $this->drupalCreateUser(); // set up user with default permissions (meaning: no read privatemsg permission
     $this->drupalLogin($user_no_write_msg);
     $this->drupalGet('messages/new');
@@ -85,7 +85,7 @@ class PrivatemsgTestCase extends DrupalW
     $this->assertResponse(200, t('HTTP Response 200: Access to Write New Message page was authorized to user with "<em>write privatemsg</em>" permission'));
   }
 
-  function dtestPaging() {
+  function testPaging() {
     $author     = $this->drupalCreateUser(array('write privatemsg', 'read privatemsg'));
     $recipient  = $this->drupalCreateUser(array('read privatemsg'));
 
@@ -201,7 +201,7 @@ class PrivatemsgTestCase extends DrupalW
    */
   function testWriteReplyPrivatemsg() {
     // Create a author and two recipients.
-    $author     = $this->drupalCreateUser(array('write privatemsg', 'select text format for privatemsg', filter_permission_name(filter_format_load(3))));
+    $author     = $this->drupalCreateUser(array('write privatemsg', 'select text format for privatemsg', filter_permission_name(filter_format_load('full_html'))));
     $recipient  = $this->drupalCreateUser(array('read privatemsg'));
     $recipient2  = $this->drupalCreateUser(array('read privatemsg', 'write privatemsg'));
 
@@ -263,7 +263,7 @@ class PrivatemsgTestCase extends DrupalW
       'recipient'   => $recipient2->name,
       'subject'     => $this->randomName(20),
       'body[value]' => $this->randomName(100) . '<b>formatted message #1</b>',
-      'body[format]' => 3,
+      'body[format]' => 'full_html',
     );
 
     // Submit the messages.
@@ -369,7 +369,7 @@ class PrivatemsgTestCase extends DrupalW
   /**
    * Test functionality around disabling private messaging.
    */
-  function dtestDisablePrivatemsg() {
+  function testDisablePrivatemsg() {
     $admin_user = $this->drupalCreateUser(array('administer permissions'));
     $enableduser = $this->drupalCreateUser(array('read privatemsg', 'write privatemsg')); // set up user with read/write privatemsg permissions
     $enableduser2 = $this->drupalCreateUser(array('read privatemsg', 'write privatemsg')); // set up user with read/write privatemsg permissions
@@ -449,7 +449,7 @@ class PrivatemsgTestCase extends DrupalW
   /**
    * Test correct handling of read all permissions.
    */
-  function dtestReadAllPermission() {
+  function testReadAllPermission() {
     $author    = $this->drupalCreateUser(array('write privatemsg', 'read privatemsg'));
     $recipient = $this->drupalCreateUser(array('write privatemsg', 'read privatemsg'));
     $admin     = $this->drupalCreateUser(array('write privatemsg', 'read privatemsg', 'read all private messages'));
@@ -513,7 +513,7 @@ class PrivatemsgTestCase extends DrupalW
   /**
    * Tests for the flush feature
    */
-  function dtestPrivatemsgFlush()
+  function testPrivatemsgFlush()
   {
     $author = $this->drupalCreateUser(array('write privatemsg', 'read privatemsg'));
     $recipient = $this->drupalCreateUser(array('write privatemsg', 'read privatemsg'));
@@ -569,7 +569,7 @@ class PrivatemsgTestCase extends DrupalW
     $this->assertTrue(empty($message), t('Message #4 has been flushed'));
   }
 
-  function dtestDelete() {
+  function testDelete() {
     // Create users.
     $author = $this->drupalCreateUser(array('write privatemsg', 'read privatemsg', 'delete privatemsg'));
     $recipient = $this->drupalCreateUser(array('write privatemsg', 'read privatemsg', 'delete privatemsg'));
@@ -728,7 +728,7 @@ class PrivatemsgTestCase extends DrupalW
   /**
    * Test preview functionality.
    */
-  function dtestPreview() {
+  function testPreview() {
     $user = $this->drupalCreateUser(array('read privatemsg', 'write privatemsg'));
 
     // Enable preview button.
@@ -748,7 +748,7 @@ class PrivatemsgTestCase extends DrupalW
   /**
    * Test autocomplete.
    */
-  function dtestAutocomplete() {
+  function testAutocomplete() {
     $current = $this->drupalCreateUser(array('read privatemsg', 'write privatemsg'));
     $user1 = $this->drupalCreateUser(array('read privatemsg', 'write privatemsg'));
     $user2 = $this->drupalCreateUser(array('read privatemsg', 'write privatemsg'));
@@ -786,7 +786,7 @@ class PrivatemsgTestCase extends DrupalW
   /**
    * Implements tearDown().
    */
-  function dtearDown() {
+  function tearDown() {
     //we dont really need to do this. i'm adding it just to keep it in front of my eyes so i can memorize it.
     parent::tearDown();
   }
@@ -815,7 +815,7 @@ class PrivatemsgFieldsTestCase extends D
     parent::setUp('privatemsg');
   }
 
-  function dtestSingleField() {
+  function testSingleField() {
     $admin = $this->drupalCreateUser(array('administer privatemsg settings', 'write privatemsg', 'read privatemsg'));
     $user = $this->drupalCreateUser(array('write privatemsg', 'read privatemsg'));
 
@@ -874,7 +874,7 @@ class PrivatemsgFieldsTestCase extends D
   /**
    * Verify that a message with an empty image can be sent.
    */
-  function dtestEmptyImage() {
+  function testEmptyImage() {
     $admin = $this->drupalCreateUser(array('administer privatemsg settings', 'write privatemsg', 'read privatemsg'));
     $user = $this->drupalCreateUser(array('write privatemsg', 'read privatemsg'));
 
@@ -940,7 +940,7 @@ class PrivatemsgLinksTestCase extends Dr
   /**
    * Tests author links displayed on nodes and comments.
    */
-  function dtestAuthorLinks() {
+  function testAuthorLinks() {
     $admin = $this->drupalCreateUser(array('read privatemsg', 'write privatemsg', 'administer privatemsg settings', 'create article content', 'create page content'));
     $user = $this->drupalCreateUser(array('read privatemsg', 'write privatemsg'));
 
@@ -1001,7 +1001,7 @@ class PrivatemsgLinksTestCase extends Dr
   /**
    * Tests menu block.
    */
-  function dtestMenuBlock() {
+  function testMenuBlock() {
     $admin = $this->drupalCreateUser(array('read privatemsg', 'write privatemsg', 'administer privatemsg settings', 'administer blocks', 'administer menu'));
     $user = $this->drupalCreateUser(array('read privatemsg'));
 
@@ -1040,7 +1040,7 @@ class PrivatemsgLinksTestCase extends Dr
   /**
    * Tests menu block.
    */
-  function dtestNewBlock() {
+  function testNewBlock() {
     $admin = $this->drupalCreateUser(array('read privatemsg', 'write privatemsg', 'administer privatemsg settings', 'administer blocks', 'administer menu'));
     $user = $this->drupalCreateUser(array('read privatemsg'));
 
@@ -1094,7 +1094,7 @@ class PrivatemsgTokenTestCase extends Dr
   /**
    * Basic token functionality.
    */
-  function dtestBasicTokens() {
+  function testBasicTokens() {
     $author = $this->drupalCreateUser(array('write privatemsg', 'read privatemsg', 'use tokens in privatemsg'));
     $recipient1 = $this->drupalCreateUser(array('write privatemsg', 'read privatemsg'));
     $recipient2 = $this->drupalCreateUser(array('write privatemsg', 'read privatemsg'));
Index: tests/privatemsgapi.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/privatemsg/tests/privatemsgapi.test,v
retrieving revision 1.1.2.1.2.13
diff -u -p -r1.1.2.1.2.13 privatemsgapi.test
--- tests/privatemsgapi.test	18 Aug 2010 06:40:39 -0000	1.1.2.1.2.13
+++ tests/privatemsgapi.test	21 Oct 2010 08:51:46 -0000
@@ -65,7 +65,7 @@ class PrivatemsgAPITestCase extends Drup
     $this->assertTrue(empty($message), 'Message was not saved in database');
 
     // Test with an input format that the author is not allowed to use.
-    $resultf4 = privatemsg_new_thread(array($recipient1, $recipient2, $recipient3), 'input filter not allowed', 'Body text', array('author' => $author, 'format' => 3));
+    $resultf4 = privatemsg_new_thread(array($recipient1, $recipient2, $recipient3), 'input filter not allowed', 'Body text', array('author' => $author, 'format' => 'full_html'));
     $errormessage = t('@user is not allowed to use the specified input format.', array('@user' => $author->name));
     $this->assertEqual($errormessage, $resultf4['messages']['error'][0], t('User is not allowed to use the specified input format.'));
     $message = $this->getMessageFromSubject('input filter not allowed');