summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Rothstein <drothstein@gmail.com>2015-03-30 21:12:20 -0400
committerDavid Rothstein <drothstein@gmail.com>2015-03-30 21:12:20 -0400
commitd6ae9e6dc393366f79cb54420fb808f20ed3df9c (patch)
treef82fc960e8b80937b5cfeddb26b1964451b60550
parentb0705c036c84649a0cd2930391e1f0ed8e573009 (diff)
downloadbrdo-d6ae9e6dc393366f79cb54420fb808f20ed3df9c.tar.gz
brdo-d6ae9e6dc393366f79cb54420fb808f20ed3df9c.tar.bz2
Issue #2386037 by gobinathm: Incorrect foreign key tables in users.install
-rw-r--r--CHANGELOG.txt2
-rw-r--r--modules/user/user.install4
2 files changed, 4 insertions, 2 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index a8be58cdc..62993ae5a 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,6 +1,8 @@
Drupal 7.36, xxxx-xx-xx (development version)
-----------------------
+- Fixed incorrect foreign keys in the User module's role_permission and
+ users_roles database tables.
- Changed permission descriptions throughout Drupal core to consistently link
to relevant administrative pages, regardless of whether the user viewing the
Permissions page can view the page being linked to (minor UI change).
diff --git a/modules/user/user.install b/modules/user/user.install
index 728e00468..b573e72d3 100644
--- a/modules/user/user.install
+++ b/modules/user/user.install
@@ -81,7 +81,7 @@ function user_schema() {
),
'foreign keys' => array(
'role' => array(
- 'table' => 'roles',
+ 'table' => 'role',
'columns' => array('rid' => 'rid'),
),
),
@@ -278,7 +278,7 @@ function user_schema() {
'columns' => array('uid' => 'uid'),
),
'role' => array(
- 'table' => 'roles',
+ 'table' => 'role',
'columns' => array('rid' => 'rid'),
),
),