- Patch #175841 by catch et al: remove comment controls for users. Yowza.

1 files changed, 15 insertions, 21 deletions

diff --git a/modules/user/user.install b/modules/user/user.install
index c2c6f2830..80d03de52 100644
--- a/modules/user/user.install
+++ b/modules/user/user.install
@@ -129,27 +129,6 @@ function user_schema() {
         'default' => '',
         'description' => t("User's email address."),
       ),
-      'mode' => array(
-        'type' => 'int',
-        'not null' => TRUE,
-        'default' => 0,
-        'size' => 'tiny',
-        'description' => t('Per-user comment display mode (threaded vs. flat), used by the {comment} module.'),
-      ),
-      'sort' => array(
-        'type' => 'int',
-        'not null' => FALSE,
-        'default' => 0,
-        'size' => 'tiny',
-        'description' => t('Per-user comment sort order (newest vs. oldest first), used by the {comment} module.'),
-      ),
-      'threshold' => array(
-        'type' => 'int',
-        'not null' => FALSE,
-        'default' => 0,
-        'size' => 'tiny',
-        'description' => t('Previously used by the {comment} module for per-user preferences; no longer used.'),
-      ),
       'theme' => array(
         'type' => 'varchar',
         'length' => 255,
@@ -310,6 +289,21 @@ function user_update_7000(&$sandbox) {
 }
 
 /**
+ * Remove the 'threshold', 'mode' and 'sort' columns from the {user} table.
+ *
+ * These fields were previously used to store per-user comment settings.
+ */
+
+function user_update_7001() {
+  $ret = array();
+  db_drop_field($ret, 'users', 'threshold');
+  db_drop_field($ret, 'users', 'mode');
+  db_drop_field($ret, 'users', 'sort');
+
+  return $ret;
+}
+
+/**
  * @} End of "defgroup user-updates-6.x-to-7.x"
  * The next series of updates should start at 8000.
  */