summaryrefslogtreecommitdiff
path: root/modules/user/user.install
diff options
context:
space:
mode:
Diffstat (limited to 'modules/user/user.install')
-rw-r--r--modules/user/user.install27
1 files changed, 26 insertions, 1 deletions
diff --git a/modules/user/user.install b/modules/user/user.install
index 9bf8f9b5f..1bb03af7a 100644
--- a/modules/user/user.install
+++ b/modules/user/user.install
@@ -349,7 +349,7 @@ function user_update_dependencies() {
// user_update_7006 relies on filter_update_7002.
// TODO: move user_update_7006 down below in the upgrade process.
$dependencies['user'][7006] = array(
- 'filter' => 7002,
+ 'filter' => 7003,
);
// user_update_7013 relies on system_update_7060.
$dependencies['user'][7013] = array(
@@ -360,6 +360,31 @@ function user_update_dependencies() {
}
/**
+ * Utility function: grant a set of permissions to a role during update.
+ *
+ * @param $rid
+ * The role ID.
+ * @param $permissions
+ * An array of permissions names.
+ * @param $module
+ * The name of the module defining the permissions.
+ */
+function _update_user_role_grant_permissions($rid, array $permissions, $module) {
+ // Grant new permissions for the role.
+ foreach ($permissions as $name) {
+ db_merge('role_permission')
+ ->key(array(
+ 'rid' => $rid,
+ 'permission' => $name,
+ ))
+ ->fields(array(
+ 'module' => $module,
+ ))
+ ->execute();
+ }
+}
+
+/**
* @defgroup user-updates-6.x-to-7.x User updates from 6.x to 7.x
* @{
*/