- Patch #44379 by Moshe: code improvements: always grant the 'authenticated user' role to authenticated users. Fixed glitch with udpate path.

2 files changed, 7 insertions, 4 deletions

diff --git a/database/database.mysql b/database/database.mysql
index cb6917c3b..87c97c837 100644
--- a/database/database.mysql
+++ b/database/database.mysql
@@ -884,9 +884,6 @@ INSERT INTO users (uid, name, mail) VALUES ('0', '', '');
 INSERT INTO role (rid, name) VALUES (1, 'anonymous user');
 INSERT INTO role (rid, name) VALUES (2, 'authenticated user');
 
-INSERT INTO users_roles (uid, rid) VALUES (0, 1);
-INSERT INTO users_roles (uid, rid) VALUES (1, 2);
-
 INSERT INTO permission VALUES (1,'access content',0);
 INSERT INTO permission VALUES (2,'access comments, access content, post comments, post comments without approval',0);
 
diff --git a/database/updates.inc b/database/updates.inc
index c82f445f5..a45a45770 100644
--- a/database/updates.inc
+++ b/database/updates.inc
@@ -1470,7 +1470,7 @@ function system_update_169() {
 
 /**
  * Converts tables to UTF-8 encoding.
- * 
+ *
  * This update is designed to be re-usable by contrib modules and is
  * used by system_update_169().
  */
@@ -1579,3 +1579,9 @@ function system_update_170() {
   }
   return array();
 }
+
+function system_update_171() {
+  $ret = array();
+  $ret[] = update_sql('DELETE FROM {users_roles} WHERE rid IN ('. DRUPAL_ANONYMOUS_RID. ', '. DRUPAL_AUTHENTICATED_RID. ')');
+  return $ret;
+}