From a28d09eb8ee957a9151b90bab146150edba3ca39 Mon Sep 17 00:00:00 2001
From: webchick <webchick@24967.no-reply.drupal.org>
Date: Sun, 17 Mar 2013 12:16:26 -0700
Subject: [PATCH] Issue #1944344 by swentel: Fixed field_ui_update_8001 deletes
permissions.
---
core/modules/field_ui/field_ui.install | 5 -----
.../Drupal/system/Tests/Upgrade/FieldUIUpgradePathTest.php | 2 +-
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/core/modules/field_ui/field_ui.install b/core/modules/field_ui/field_ui.install
index f0ad03566359..8ce3e2c1b30e 100644
--- a/core/modules/field_ui/field_ui.install
+++ b/core/modules/field_ui/field_ui.install
@@ -41,10 +41,5 @@ function field_ui_update_8001() {
}
$query->execute();
}
-
- // Remove old permission.
- db_delete('role_permission')
- ->condition('permission', $old_permission)
- ->execute();
}
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/FieldUIUpgradePathTest.php b/core/modules/system/lib/Drupal/system/Tests/Upgrade/FieldUIUpgradePathTest.php
index 3ec88b332164..f344afb2840e 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Upgrade/FieldUIUpgradePathTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Upgrade/FieldUIUpgradePathTest.php
@@ -66,7 +66,7 @@ function testFieldUIPermissions() {
$role_permissions = user_role_permissions(array($this->normal_role_id => $this->normal_role_name, $this->admin_role_id => $this->admin_role_name));
foreach ($permissions as $old_permission => $new_permissions) {
$this->assertFalse(isset($role_permissions[$this->normal_role_id][$old_permission]), format_string('%role_name does not have the old %permission permission', array('%role_name' => $this->normal_role_name, '%permission' => $old_permission)));
- $this->assertFalse(isset($role_permissions[$this->admin_role_id][$old_permission]), format_string('%role_name does not have the old %permission permission', array('%role_name' => $this->admin_role_name, '%permission' => $old_permission)));
+ $this->assertTrue(isset($role_permissions[$this->admin_role_id][$old_permission]), format_string('%role_name still has the old %permission permission', array('%role_name' => $this->admin_role_name, '%permission' => $old_permission)));
foreach ($new_permissions as $new_permission) {
$this->assertFalse(isset($role_permissions[$this->normal_role_id][$new_permission]), format_string('%role_name does not have the new %permission permission', array('%role_name' => $this->normal_role_name, '%permission' => $new_permission)));
$this->assertTrue(isset($role_permissions[$this->admin_role_id][$new_permission]), format_string('%role_name has the new %permission permission', array('%role_name' => $this->admin_role_name, '%permission' => $new_permission)));
--
GitLab