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 00:34:35 -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, )); +} + +/** + * 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.', + )); } \ No newline at end of file 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 00:34:49 -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 "write privatemsg" permission')); } - function dtestPaging() { + function testPaging() { $author = $this->drupalCreateUser(array('write privatemsg', 'read privatemsg')); $recipient = $this->drupalCreateUser(array('read privatemsg')); @@ -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'));