diff --git a/commons.info b/commons.info index ab73c36..d2e0cbc 100644 --- a/commons.info +++ b/commons.info @@ -43,6 +43,7 @@ dependencies[] = module_filter dependencies[] = og dependencies[] = panels dependencies[] = pathauto +dependencies[] = privatemsg dependencies[] = quicktabs dependencies[] = r4032login dependencies[] = libraries diff --git a/commons.profile b/commons.profile index 818c45c..d6e996c 100644 --- a/commons.profile +++ b/commons.profile @@ -158,6 +158,12 @@ function commons_install_tasks() { 'commons_admin_permissions' => array( 'display' => FALSE, ), + 'commons_set_permissions' => array( + 'display' => FALSE, + ), + 'commons_set_variables' => array( + 'display' => FALSE, + ), ); } @@ -258,6 +264,27 @@ function commons_admin_permissions() { } /** + * Task callback; Set permissions. + */ +function commons_set_permissions() { + // Set PrivateMsg permissions for authenticated users. + $permissions = array( + 'read privatemsg', + 'write privatemsg', + 'delete privatemsg', + ); + user_role_grant_permissions(DRUPAL_AUTHENTICATED_RID, $permissions); +} + +/** + * Task callback; Set variables. + */ +function commons_set_variables() { + // Do not inform the user about new messages on login. + variable_set('privatemsg_display_loginmessage', FALSE); +} + +/** * Save the full name of the first user. */ function commons_admin_save_fullname($form_id, &$form_state) { @@ -713,4 +740,4 @@ function commons_set_default_avatar() { variable_set('user_picture_default', $picture_path); } } -} \ No newline at end of file +} diff --git a/drupal-org.make b/drupal-org.make index 7c031a6..bb141f4 100644 --- a/drupal-org.make +++ b/drupal-org.make @@ -220,7 +220,8 @@ projects[oauthconnector][download][revision] = "0ce7ac9614710c0f68d0a58cb4ae4667 projects[og][type] = "module" projects[og][subdir] = "contrib" -projects[og][version] = "2.1" +projects[og][version] = "2.x-dev" +projects[og][patch][] = "http://drupal.org/files/1983090-save_created-3.patch" ; og_group_ref field should respect og_user_access() ; http://drupal.org/node/1902086#comment-7026516 @@ -250,6 +251,11 @@ projects[pm_existing_pages][type] = "module" projects[pm_existing_pages][subdir] = "contrib" projects[pm_existing_pages][version] = "1.4" +projects[privatemsg][type] = "module" +projects[privatemsg][subdir] = "contrib" +projects[privatemsg][version] = "1.x-dev" +projects[privatemsg][patch][] = "http://drupal.org/files/privatemsg-1573000-64.patch" + projects[quicktabs][type] = "module" projects[quicktabs][subdir] = "contrib" projects[quicktabs][download][type] = "git"